Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: .cvsignore
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: BUGS.ja
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/COPYING /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/COPYING
--- work/emacs-w3m-1.4.4/COPYING	2002-03-02 16:44:16.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/COPYING	2005-07-06 08:52:27.000000000 +0900
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
 
 
 Also add information on how to contact you by electronic and paper mail.
Only in work/emacs-w3m-1.4.4/: Makefile
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/Makefile.in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/Makefile.in
--- work/emacs-w3m-1.4.4/Makefile.in	2013-06-14 14:07:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/Makefile.in	2012-01-06 11:02:58.000000000 +0900
@@ -1,6 +1,7 @@
 INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 prefix       = @prefix@
+datarootdir  = @datarootdir@
 datadir      = @datadir@
 infodir      = @infodir@
 lispdir      = @lispdir@
@@ -16,6 +17,12 @@
 VANILLA_FLAG = @VANILLA_FLAG@
 FLAGS   = $(VANILLA_FLAG) -batch -l $(srcdir)/w3mhack.el $(ADDITIONAL_LOAD_PATH)
 
+## This is used to set the environment variable XEMACSDEBUG for XEmacs
+## 21.5 in order to suppress warnings for Lisp shadows when XEmacs 21.5
+## starts.  This is used also for not installing w3m-ems.el for XEmacs
+## and w3m-xmas.el for GNU Emacs.
+XEMACSDEBUG = @XEMACSDEBUG@
+
 IGNORES = w3mhack.el
 
 PACKAGE = emacs-w3m
@@ -33,10 +40,11 @@
 lisp: Makefile
 	env test ! -f w3m-util.elc -o w3m-util.elc -nt w3m-util.el || $(MAKE) clean
 	env test ! -f w3m-proc.elc -o w3m-proc.elc -nt w3m-proc.el || $(MAKE) clean
-	$(EMACS) $(FLAGS) -f w3mhack-compile
+	$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-compile
 
+# `w3mhack-what-where' respects DESTDIR
 what-where:
-	@$(EMACS) $(FLAGS) -f w3mhack-what-where\
+	@$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-what-where\
 	 "$(lispdir)" "$(ICONDIR)" "$(PACKAGEDIR)" "$(infodir)"
 
 info:
@@ -55,84 +63,101 @@
 install-ja: install-lisp install-info-ja
 
 install-lisp: lisp
-	@$(SHELL) $(srcdir)/mkinstalldirs $(lispdir);\
-	for p in ChangeLog* *.el; do\
-	  case "$$p" in\
-	    $(IGNORES)) ;;\
-	    *) echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
-	       $(INSTALL_DATA) $$p $(lispdir)/$$p;;\
-	  esac;\
+	@$(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)";\
+	for p in ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9] *.el; do\
+	  if test -f "$$p"; then\
+	    case "$$p" in\
+	      $(IGNORES)) ;;\
+	      w3m-ems\.el) if test -z "$(XEMACSDEBUG)"; then\
+	         echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	         $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; fi;;\
+	      w3m-xmas\.el) if test -n "$(XEMACSDEBUG)"; then\
+	         echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	         $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; fi;;\
+	      *) echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	         $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p";;\
+	    esac;\
+	  fi;\
 	done;\
 	for p in *.elc; do\
 	  if test -f "$$p"; then\
-	    echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
-	    $(INSTALL_DATA) $$p $(lispdir)/$$p;\
+	    echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	    $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p";\
 	  fi;\
 	done;\
 	if test -f shimbun/shimbun.elc; then\
+	  for p in `cd shimbun && echo ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9]`; do\
+	    if test -f "shimbun/$$p"; then\
+	      echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/s$$p\"";\
+	      $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\
+	    fi;\
+	  done;\
 	  for p in `cd shimbun && echo *.el`; do\
-	    echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
-	    $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+	    echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	    $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\
 	  done;\
 	  for p in `cd shimbun && echo *.elc`; do\
-	    echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
-	    $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+	    echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+	    $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\
 	  done;\
 	fi
 
 install-icons:
-	@if test $(ICONDIR) = NONE; then\
+	@if test "$(ICONDIR)" = NONE; then\
 	  echo "You don't have to install icon files for \"$(EMACS)\".";\
 	else\
-	  $(SHELL) $(srcdir)/mkinstalldirs $(ICONDIR);\
-	  for i in `cd icons && echo *.gif *.xpm`; do\
-	    echo " $(INSTALL_DATA) icons/$$i $(ICONDIR)/$$i";\
-	    $(INSTALL_DATA) icons/$$i $(ICONDIR)/$$i;\
+	  $(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(ICONDIR)";\
+	  for i in `cd icons && echo *.gif *.png *.xpm`; do\
+	    echo "$(INSTALL_DATA) icons/$$i \"$(DESTDIR)$(ICONDIR)/$$i\"";\
+	    $(INSTALL_DATA) icons/$$i "$(DESTDIR)$(ICONDIR)/$$i";\
 	  done;\
 	fi
 
 install-icons30:
-	@if test $(ICONDIR) = NONE; then\
+	@if test "$(ICONDIR)" = NONE; then\
 	  echo "You don't have to install icon files for \"$(EMACS)\".";\
 	else\
-	  $(SHELL) $(srcdir)/mkinstalldirs $(ICONDIR);\
-	  for i in `cd icons30 && echo *.gif *.xpm`; do\
-	    echo " $(INSTALL_DATA) icons30/$$i $(ICONDIR)/$$i";\
-	    $(INSTALL_DATA) icons30/$$i $(ICONDIR)/$$i;\
+	  $(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(ICONDIR)";\
+	  for i in `cd icons30 && echo *.gif *.png *.xpm`; do\
+	    echo "$(INSTALL_DATA) icons30/$$i \"$(DESTDIR)$(ICONDIR)/$$i\"";\
+	    $(INSTALL_DATA) icons30/$$i "$(DESTDIR)$(ICONDIR)/$$i";\
 	  done;\
 	fi
 
 install-info: info
+	@echo "cd doc && $(MAKE) EMACS=\"$(EMACS)\" infodir=\"$(DESTDIR)$(infodir)\" install";\
 	cd doc && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install
 
 install-info-en: info-en
+	@echo "cd doc && $(MAKE) EMACS=\"$(EMACS)\" infodir=\"$(DESTDIR)$(infodir)\" install-en";\
 	cd doc && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-en
 
 install-info-ja: info-ja
+	@echo "cd doc && $(MAKE) EMACS=\"$(EMACS)\" infodir=\"$(DESTDIR)$(infodir)\" install-ja";\
 	cd doc && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja
 
 install-package:
 	@if test $(PACKAGEDIR) = NONE; then\
 	  echo "What a pity!  Your \"$(EMACS)\" does not support"\
-		"a package system.";\
+		"the package system.";\
 	else\
 	  $(MAKE) lispdir="$(PACKAGEDIR)/lisp/w3m" install-lisp;\
-	  $(MAKE) ICONDIR="$(PACKAGEDIR)/etc/w3m" install-icons30;\
+	  $(MAKE) ICONDIR="$(PACKAGEDIR)/etc/images/w3m" install-icons30;\
 	  $(MAKE) infodir="$(PACKAGEDIR)/info" install-info;\
-	  echo "$(EMACS) $(FLAGS) -f w3mhack-make-package $(PACKAGEDIR)";\
-	  $(EMACS) $(FLAGS) -f w3mhack-make-package $(PACKAGEDIR);\
+	  echo "$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-make-package $(DESTDIR)$(PACKAGEDIR)";\
+	  $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-make-package $(DESTDIR)$(PACKAGEDIR);\
 	fi
 
 install-package-ja:
 	@if test $(PACKAGEDIR) = NONE; then\
 	  echo "What a pity!  Your \"$(EMACS)\" does not support"\
-		"a package system.";\
+		"the package system.";\
 	else\
 	  $(MAKE) lispdir="$(PACKAGEDIR)/lisp/w3m" install-lisp;\
-	  $(MAKE) ICONDIR="$(PACKAGEDIR)/etc/w3m" install-icons30;\
+	  $(MAKE) ICONDIR="$(PACKAGEDIR)/etc/images/w3m" install-icons30;\
 	  $(MAKE) infodir="$(PACKAGEDIR)/info" install-info-ja;\
-	  echo "$(EMACS) $(FLAGS) -f w3mhack-make-package $(PACKAGEDIR)";\
-	  $(EMACS) $(FLAGS) -f w3mhack-make-package $(PACKAGEDIR);\
+	  echo "$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-make-package $(DESTDIR)$(PACKAGEDIR)";\
+	  $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-make-package $(DESTDIR)$(PACKAGEDIR);\
 	fi
 
 Makefile: Makefile.in config.status
@@ -146,14 +171,14 @@
 
 dist: Makefile w3m.elc
 	$(MAKE) tarball \
-	  VERSION=`$(EMACS) $(FLAGS) -f w3mhack-version 2>/dev/null` \
+	  VERSION=`$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-version 2>/dev/null` \
 	  BRANCH=`cvs status Makefile.in|grep "Sticky Tag:"|awk '{print $$3}'|sed 's,(none),HEAD,'`
 
 tarball: CVS/Root CVS/Repository
 	-rm -rf $(DISTDIR) $(TARBALL) `basename $(TARBALL) .gz`
 	cvs -d `cat CVS/Root` -w export -d $(DISTDIR) -r $(BRANCH) `cat CVS/Repository`
 	-cvs diff |( cd $(DISTDIR) && patch -p0 )
-	for f in BUGS.ja w3m-e23.el; do\
+	for f in BUGS.ja; do\
 	  if [ -f $(DISTDIR)/$${f} ]; then\
 	    rm -f $(DISTDIR)/$${f} || exit 1;\
 	  fi;\
@@ -169,56 +194,48 @@
 
 clean:
 	-rm -rf $(PACKAGE)* ;\
-	rm -f *~ *.elc shimbun/*.elc w3m-load.el w3m-kwds.el ;\
-	rm -f doc/*~ doc/*.info doc/*.info-[0-9] doc/*.info-[0-9][0-9]
+	rm -f *~ *.elc shimbun/*.elc w3m-load.el ;\
+	rm -f doc/*~ doc/*.info doc/*.info-[0-9] doc/*.info-[0-9][0-9]\
+ doc/version.texi
 
 distclean: clean
 	-rm -f config.log config.status config.cache Makefile doc/Makefile;\
 	rm -fr autom4te*.cache
 
-## Rules for the developers to check a portability for each module.
+## Rules for the developers to check the portability for each module.
 .SUFFIXES: .elc .el
 
 .el.elc:
-	echo "$(EMACS) $(FLAGS) -f w3mhack-batch-compile $*.el";\
-	$(EMACS) $(FLAGS) -f w3mhack-batch-compile $*.el
+	@echo "$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f batch-byte-compile $*.el";\
+	$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f batch-byte-compile $*.el
 
 slow: Makefile
-	@for i in `$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
+	@for i in `$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
 	do $(MAKE) -s $$i; done
 
-very-slow: clean keywords Makefile
+very-slow: clean Makefile
 	@args="$(VANILLA_FLAG) -batch";\
 	args="$$args -l $(srcdir)/attic/addpath.el $(ADDITIONAL_LOAD_PATH)";\
 	echo "=============================================";\
 	echo "Compiling the 1st stage-----without elc files";\
 	echo "=============================================";\
-	for i in `$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
+	for i in `$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
 	  do\
 	  j=`echo $$i| sed 's/elc$$/el/g'`;\
-	  echo "$(EMACS) ARGS -f batch-byte-compile $$j";\
-	  $(EMACS) $$args -f batch-byte-compile $$j;\
+	  echo "$(XEMACSDEBUG)$(EMACS) ARGS -f batch-byte-compile $$j";\
+	  $(XEMACSDEBUG)$(EMACS) $$args -f batch-byte-compile $$j;\
 	  mv $$i $$j"x";\
 	done;\
 	for i in `echo *.elx shimbun/*.elx`; do\
 	  j=`echo $$i| sed 's/elx$$/elc/g'`;\
-	  if test -f $$i; then mv $$i $$j; fi\
+	  if test -f $$i; then mv $$i $$j; fi;\
 	done;\
 	echo "==============================================";\
 	echo "Compiling the 2nd stage-----with all elc files";\
 	echo "==============================================";\
-	for i in `$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
+	for i in `$(XEMACSDEBUG)$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-examine-modules 2>/dev/null`;\
 	  do\
 	  j=`echo $$i| sed 's/elc$$/el/g'`;\
-	  echo "$(EMACS) ARGS -f batch-byte-compile $$j";\
-	  $(EMACS) $$args -f batch-byte-compile $$j;\
+	  echo "$(XEMACSDEBUG)$(EMACS) ARGS -f batch-byte-compile $$j";\
+	  $(XEMACSDEBUG)$(EMACS) $$args -f batch-byte-compile $$j;\
 	done
-
-## Create the file w3m-kwds.el if it is needed for $(EMACS).
-keywords:
-	@ echo "$(EMACS) $(FLAGS)";\
-	$(EMACS) $(FLAGS) -f w3mhack-check-colon-keywords-file ;\
-	if test ! -f w3m-kwds.el; then\
-	  echo "There is no need to bind colon keywords for \"$(EMACS)\".";\
-	  echo "The file w3m-kwds.el is not created.";\
-	fi
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: NEWS
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: NEWS.ja
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/aclocal.m4 /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/aclocal.m4
--- work/emacs-w3m-1.4.4/aclocal.m4	2005-02-21 21:31:13.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/aclocal.m4	2012-01-06 11:02:58.000000000 +0900
@@ -8,6 +8,17 @@
   fi
   AC_SUBST(VANILLA_FLAG)])
 
+AC_DEFUN(AC_SET_XEMACSDEBUG,
+ [dnl Set the XEMACSDEBUG environment variable, which is eval'd when
+  dnl XEmacs 21.5 starts, in order to suppress warnings for Lisp shadows
+  dnl when XEmacs 21.5 starts.
+  if test "${VANILLA_FLAG}" = "-vanilla"; then
+	XEMACSDEBUG='XEMACSDEBUG='\''(setq log-warning-minimum-level (quote error))'\'' '
+  else
+	XEMACSDEBUG=
+  fi
+  AC_SUBST(XEMACSDEBUG)])
+
 AC_DEFUN(AC_EMACS_LISP, [
 elisp="$2"
 if test -z "$3"; then
@@ -15,8 +26,8 @@
 fi
 AC_CACHE_VAL(EMACS_cv_SYS_$1,[
 	OUTPUT=./conftest-$$
-	echo ${EMACS}' '${VANILLA_FLAG}' -batch -eval '\''(let ((x '"${elisp}"')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
-	eval ${EMACS}' '${VANILLA_FLAG}' -batch -eval '\''(let ((x '"${elisp}"')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	echo ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -eval '\''(let ((x '"${elisp}"')) (write-region (format "%s" x) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -eval '\''(let ((x '"${elisp}"')) (write-region (format "%s" x) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
 	retval="`cat ${OUTPUT}`"
 	echo "=> ${retval}" >& AC_FD_CC 2>&1
 	rm -f ${OUTPUT}
@@ -39,9 +50,9 @@
   unset ac_cv_prog_EMACS; unset EMACS_cv_SYS_flavor;
 
   AC_ARG_WITH(emacs,
-   [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs, mule...]],
+   [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs...]],
    [if test "${withval}" = yes -o -z "${withval}"; then
-      AC_PATH_PROGS(EMACS, emacs xemacs mule, emacs)
+      AC_PATH_PROGS(EMACS, emacs xemacs, emacs)
     else
       AC_PATH_PROG(EMACS, ${withval}, ${withval}, emacs)
     fi])
@@ -52,43 +63,59 @@
     else
       AC_PATH_PROG(EMACS, $withval, $withval, xemacs)
     fi])
-  test -z "${EMACS}" && AC_PATH_PROGS(EMACS, emacs xemacs mule, emacs)
+  test -z "${EMACS}" && AC_PATH_PROGS(EMACS, emacs xemacs, emacs)
   AC_SUBST(EMACS)
   AC_SET_VANILLA_FLAG
+  AC_SET_XEMACSDEBUG
 
   AC_MSG_CHECKING([what a flavor does ${EMACS} have])
   AC_EMACS_LISP(flavor,
-    (cond ((featurep (quote xemacs)) \"XEmacs\")\
-          ((and (boundp (quote emacs-major-version))\
-                (>= emacs-major-version 21))\
-           (format \"Emacs %d\" emacs-major-version))\
-          ((boundp (quote MULE)) \"MULE\")\
-          (t \"Emacs\")),
+    (if (featurep (quote xemacs))
+	\"XEmacs\"
+      (concat \"Emacs \"
+	      (mapconcat (function identity)
+			 (nreverse
+			  (cdr (nreverse
+				(split-string emacs-version
+					      (concat (vector 92 46))))))
+			 \".\"))),
     noecho)
   case "${flavor}" in
   XEmacs)
     EMACS_FLAVOR=xemacs;;
-  MULE)
-    EMACS_FLAVOR=mule;;
-  Emacs\ 2[[123]])
-    EMACS_FLAVOR=emacs21;;
-  *)
+  Emacs\ 2[[1234]]\.*)
     EMACS_FLAVOR=emacs;;
+  *)
+    EMACS_FLAVOR=unsupported;;
   esac
-  AC_MSG_RESULT(${flavor})])
+  AC_MSG_RESULT(${flavor})
+  if test ${EMACS_FLAVOR} = unsupported; then
+    AC_MSG_ERROR(${flavor} is not supported.)
+    exit 1
+  fi])
 
 AC_DEFUN(AC_EXAMINE_PACKAGEDIR,
  [dnl Examine PACKAGEDIR.
   AC_EMACS_LISP(PACKAGEDIR,
     (let ((prefix \"${prefix}\")\
 	  (dirs (append\
+		 (cond ((boundp (quote early-package-hierarchies))\
+			(append (if early-package-load-path\
+				    early-package-hierarchies)\
+				(if late-package-load-path\
+				    late-package-hierarchies)\
+				(if last-package-load-path\
+				    last-package-hierarchies)))\
+		       ((boundp (quote early-packages))\
+			(append (if early-package-load-path\
+				    early-packages)\
+				(if late-package-load-path\
+				    late-packages)\
+				(if last-package-load-path\
+				    last-packages))))\
 		 (if (and (boundp (quote configure-package-path))\
 			  (listp configure-package-path))\
-		     (delete \"\" configure-package-path))\
-		 (if (boundp (quote early-packages))\
-		     (append (if early-package-load-path early-packages)\
-			     (if late-package-load-path late-packages)\
-			     (if last-package-load-path last-packages)))))\
+		     (delete \"\" configure-package-path))))\
 	  package-dir)\
       (while (and dirs (not package-dir))\
 	(if (file-directory-p (car dirs))\
@@ -132,17 +159,17 @@
   AC_SUBST(PACKAGEDIR)])
 
 AC_DEFUN(AC_PATH_LISPDIR, [
-  if test ${EMACS_FLAVOR} = emacs21; then
+  if test ${EMACS_FLAVOR} = emacs; then
 	tribe=emacs
   else
 	tribe=${EMACS_FLAVOR}
   fi
-  if test ${prefix} = NONE; then
-	AC_MSG_CHECKING([prefix for ${EMACS}])
+  AC_MSG_CHECKING([prefix for ${EMACS}])
+  if test "${prefix}" = NONE; then
 	AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),noecho)
 	prefix=${EMACS_cv_SYS_prefix}
-	AC_MSG_RESULT(${prefix})
   fi
+  AC_MSG_RESULT(${prefix})
   AC_ARG_WITH(lispdir,
     [  --with-lispdir=DIR      where lisp files should go
                           (use --with-packagedir for XEmacs package)],
@@ -150,14 +177,15 @@
   AC_MSG_CHECKING([where lisp files should go])
   if test -z "${lispdir}"; then
     dnl Set the default value.
-    theprefix=${prefix}
-    if test x${theprefix} = xNONE; then
+    theprefix="${prefix}"
+    if test "${theprefix}" = NONE; then
 	theprefix=${ac_default_prefix}
     fi
     lispdir="\$(datadir)/${tribe}/site-lisp/w3m"
     for thedir in share lib; do
 	potential=
-	if test -d ${theprefix}/${thedir}/${tribe}/site-lisp; then
+	dnl The directory name should be quoted because it might contain spaces.
+	if test -d "${theprefix}/${thedir}/${tribe}/site-lisp"; then
 	   lispdir="\$(prefix)/${thedir}/${tribe}/site-lisp/w3m"
 	   break
 	fi
@@ -177,7 +205,7 @@
   dnl Ignore cache.
   unset EMACS_cv_SYS_icondir;
 
-  if test ${EMACS_FLAVOR} = xemacs -o ${EMACS_FLAVOR} = emacs21; then
+  if test ${EMACS_FLAVOR} = xemacs -o ${EMACS_FLAVOR} = emacs; then
     AC_ARG_WITH(icondir,
      [  --with-icondir=ICONDIR  directory for icons [\$(data-directory)/images/w3m]],
       ICONDIR="${withval}")
@@ -217,9 +245,9 @@
 	ADDITIONAL_LOAD_PATH="${withval}"
       else
 	if test x"$USER" != xroot -a x"$HOME" != x -a -f "$HOME"/.emacs; then
-          ADDITIONAL_LOAD_PATH=`"$EMACS" -batch -l "$HOME"/.emacs -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | $EGREP -v '^$'`
+          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG}${EMACS} -batch -l "$HOME"/.emacs -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | $EGREP -v '^$'`
         else
-          ADDITIONAL_LOAD_PATH=`"$EMACS" -batch -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | $EGREP -v '^$'`
+          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG}${EMACS} -batch -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | $EGREP -v '^$'`
         fi
       fi
       AC_MSG_RESULT(${ADDITIONAL_LOAD_PATH})],
@@ -234,32 +262,8 @@
         ADDITIONAL_LOAD_PATH=${ADDITIONAL_LOAD_PATH}:`pwd`/attic
       fi
     fi])
-  retval=`eval $EMACS' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status'`
+  retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | $EGREP -v '\''^$'\'`
   if test x"$retval" != xOK; then
     AC_MSG_ERROR([Process couldn't proceed.  See the above messages.])
   fi
   AC_SUBST(ADDITIONAL_LOAD_PATH)])
-
-AC_DEFUN(AC_CHECK_ELISP,
- [dnl Check for requried elisp library.
-  AC_MSG_CHECKING(for $1)
-  retval=`eval $EMACS' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-locate-library '$1' 2>/dev/null | $EGREP -v '\''^$'\'`
-  if test x"$retval" != x; then
-    AC_MSG_RESULT(${retval})
-  else
-    AC_MSG_ERROR($1.el is missing)
-  fi])
-
-AC_DEFUN(AC_CHECK_XML,
- [RSS=no
-  AC_ARG_WITH(xml,
-   [  --with-xml              compile shimbun modules using xml.el [default: no]],
-   [if test "x${withval}" = xyes; then
-      RSS=yes
-    else
-      RSS=no
-    fi]
-   [])
-  if test "x${RSS}" = xyes; then
-    AC_CHECK_ELISP(xml)
-  fi])
Only in work/emacs-w3m-1.4.4/attic: regexp-opt.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/attic: rfc2368.el
Only in work/emacs-w3m-1.4.4/attic: vm-w3m.el
Only in work/emacs-w3m-1.4.4/attic: xml.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: bookmark-w3m.el
Only in work/emacs-w3m-1.4.4/: config.log
Only in work/emacs-w3m-1.4.4/: config.status
Only in work/emacs-w3m-1.4.4/: configure
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/configure.in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/configure.in
--- work/emacs-w3m-1.4.4/configure.in	2004-04-28 13:09:30.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/configure.in	2006-01-16 20:49:49.000000000 +0900
@@ -5,12 +5,12 @@
 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, false)
 AC_CHECK_PROG(PTEX, ptex, ptex, false)
 AC_CHECK_PROG(JBIBTEX, jbibtex, jbibtex, false)
+AC_CHECK_PROG(DVIPDFMX, dvipdfmx, dvipdfmx, false)
+AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, false)
 AC_CHECK_PROGS(EGREP, egrep grep, )
 AC_PATH_EMACS
 AC_PATH_LISPDIR
 AC_PATH_PACKAGEDIR
 AC_PATH_ICONDIR
 AC_ADD_LOAD_PATH
-AC_CHECK_ELISP(regexp-opt)
-AC_CHECK_XML
 AC_OUTPUT(Makefile doc/Makefile)
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc: .cvsignore
Only in work/emacs-w3m-1.4.4/doc: Makefile
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/doc/Makefile.in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/Makefile.in
--- work/emacs-w3m-1.4.4/doc/Makefile.in	2005-01-05 16:52:22.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/Makefile.in	2012-01-06 11:03:00.000000000 +0900
@@ -1,9 +1,10 @@
-.SUFFIXES: .texi .info
+.SUFFIXES: .texi .info .pdf
 
 INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = install-info
 prefix       = @prefix@
+datarootdir  = @datarootdir@
 infodir      = @infodir@
 srcdir       = @srcdir@
 subdir       = doc
@@ -17,10 +18,18 @@
 TEXI2DVI     = @TEXI2DVI@
 PTEX         = @PTEX@
 JBIBTEX      = @JBIBTEX@
+DVIPDFMX     = @DVIPDFMX@
+TEXI2PDF     = @TEXI2PDF@
 EMACS        = @EMACS@
 VANILLA_FLAG = @VANILLA_FLAG@
 FLAGS        = $(VANILLA_FLAG) -batch -l ./w3mhack.el $(ADDITIONAL_LOAD_PATH)
-EMACSINFO    = cd $(top_srcdir) && $(EMACS) $(FLAGS) -f w3mhack-makeinfo
+
+## This is used to set the environment variable XEMACSDEBUG for
+## XEmacs 21.5 in order to suppress warnings for Lisp shadows
+## when XEmacs 21.5 starts.
+XEMACSDEBUG = @XEMACSDEBUG@
+
+EMACSINFO    = cd $(top_srcdir) && $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-makeinfo
 
 INFO_DEPS_EN = emacs-w3m.info
 INFO_DEPS_JA = emacs-w3m-ja.info
@@ -34,7 +43,7 @@
 
 version.texi: $(top_srcdir)/w3m.el
 	@version=`cd $(top_srcdir)\
-		&& $(EMACS) $(FLAGS) -f w3mhack-version 2>/dev/null`;\
+		&& $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-version 2>/dev/null`;\
 	echo "@set VERSION $$version"> version.texi
 
 emacs-w3m.info: version.texi emacs-w3m.texi
@@ -53,39 +62,41 @@
 	      $(EMACSINFO) $$texi ;\
 	    else \
 	      echo "Formatting $$texi using $(MAKEINFO)..." ;\
-	      LC_ALL=C $(MAKEINFO) -o $@ $$texi ;\
+	      LC_ALL=C $(MAKEINFO) --no-split -o $@ $$texi ;\
 	      echo "Formatting $$texi using $(MAKEINFO)...done" ;\
 	    fi ;;\
 	esac
 
 install: $(INFO_DEPS)
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
-	@list='$(INFO_DEPS)';\
-	for file in $$list; do\
-	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do\
-	    if test -f $$ifile; then\
-	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile";\
-	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile;\
-	    else : ; fi;\
-	  done;\
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(infodir)"
+	@for file in $(INFO_DEPS); do\
+	  if test -f $$file; then\
+	    for old in `cd "$(DESTDIR)$(infodir)" && echo $$file-[0-9]`; do\
+	      if test -f "$(DESTDIR)$(infodir)/$$old"; then\
+	        echo "rm -f \"$(DESTDIR)$(infodir)/$$old\"";\
+	        rm -f "$(DESTDIR)$(infodir)/$$old";\
+	      fi;\
+	    done;\
+	    echo "$(INSTALL_DATA) $$file \"$(DESTDIR)$(infodir)/$$file\"";\
+	    $(INSTALL_DATA) $$file "$(DESTDIR)$(infodir)/$$file";\
+	  else : ; fi;\
 	done
 	@if $(SHELL) -c $(INSTALL_INFO)' --version| sed 1q\
 		| fgrep -s -v -i debian'>/dev/null 2>&1; then\
-	  list='$(INFO_DEPS)';\
-	  for file in $$list; do\
-	    if test -f $(infodir)/$$file; then\
-	      echo " $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file";\
-	      $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file || :;\
+	  for file in $(INFO_DEPS); do\
+	    if test -f "$(DESTDIR)$(infodir)/$$file"; then\
+	      echo "$(INSTALL_INFO) --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
+	      $(INSTALL_INFO) --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
 	    else : ; fi\
 	  done;\
 	else : ; fi
 
 install-en: $(INFO_DEPS_EN)
-	$(MAKE) INFO_DEPS='$(INFO_DEPS_EN)' EMACS="$(EMACS)"\
+	$(MAKE) INFO_DEPS='$(INFO_DEPS_EN)' $(XEMACSDEBUG)EMACS="$(EMACS)"\
 		infodir="$(infodir)" install
 
 install-ja: $(INFO_DEPS_JA)
-	$(MAKE) INFO_DEPS='$(INFO_DEPS_JA)' EMACS="$(EMACS)"\
+	$(MAKE) INFO_DEPS='$(INFO_DEPS_JA)' $(XEMACSDEBUG)EMACS="$(EMACS)"\
 		infodir="$(infodir)" install
 
 dvi: dvi-en dvi-ja
@@ -102,13 +113,34 @@
 	@texi=$<;\
 	case "$$texi" in \
 	  *-ja.texi) \
-	    env TEX=$(PTEX) BIBTEX=$(JBIBTEX) $(TEXI2DVI) -l ja -o $@ $$texi ;;\
+	    env TEX=$(PTEX) BIBTEX=$(JBIBTEX) $(TEXI2DVI) -o $@ $$texi ;;\
 	  *) \
 	    $(TEXI2DVI) -o $@ $$texi ;;\
 	esac
 
+pdf: pdf-en pdf-ja
+
+pdf-en: emacs-w3m.pdf
+
+pdf-ja: emacs-w3m-ja.pdf
+
+emacs-w3m.pdf: version.texi emacs-w3m.texi
+
+emacs-w3m-ja.pdf: version.texi emacs-w3m-ja.texi
+
+.texi.pdf:
+	@texi=$<;\
+	case "$$texi" in\
+	  *-ja.texi)\
+	     i=`basename $@ .pdf`;\
+	    $(MAKE) $$i.dvi; $(DVIPDFMX) $$i;;\
+	  *) \
+	    $(TEXI2PDF) $$texi;;\
+	esac
+
 clean:
-	-rm -rf *~ *.info *.info-[0-9] *.info-[0-9][0-9] *.dvi *.ps missfont.log
+	-rm -rf *~ *.info version.texi *.dvi missfont.log *.pdf *.aux *.cp\
+ *.cps *.fn *.fns *.ky *.kys *.log *.pg *.toc *.tp *.vr *.vrs
 
 distclean: clean
 	-rm -f Makefile
Only in work/emacs-w3m-1.4.4/doc: emacs-w3m.info
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/doc/ptexinfmt.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/ptexinfmt.el
--- work/emacs-w3m-1.4.4/doc/ptexinfmt.el	2005-02-24 17:10:15.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/ptexinfmt.el	2012-04-12 12:08:08.000000000 +0900
@@ -1,4 +1,4 @@
-;;; ptexinfmt.el -- portable Texinfo formatter.
+;;; ptexinfmt.el --- portable Texinfo formatter  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
 ;;               1994, 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -24,8 +24,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -37,26 +37,35 @@
 ;; Modified by Yamaoka not to use APEL functions.
 
 ;; Unimplemented command:
-;;  @abbr
-;;  @float, @caption, @shortcaption, @listoffloats
+;;  @abbr{ABBREVIATION}
+;;  @float ... @end float, @caption{TEXT}, @shortcaption{TEXT}, @listoffloats
 ;;  @deftypecv[x]
 ;;  @headitem
-;;  @comma{}
 ;;  @quotation (optional arguments)
-;;  @acronym (optional argument)
+;;  @acronym{ACRONYM[, MEANING]} (optional argument)
 ;;  @dofirstparagraphindent
 ;;  @indent
-;;  @verbatiminclude
+;;  @verbatiminclude FILENAME
 ;;  @\
-;;  @definfoenclose
-;;  @deftypeivar
-;;  @deftypeop
+;;  @definfoenclose phoo,//,\\
+;;  @deftypeivar CLASS DATA-TYPE VARIABLE-NAME
+;;  @deftypeop CATEGORY CLASS DATA-TYPE NAME ARGUMENTS...
+;;  @allowcodebreaks false
+;;  @thischapternum
+;;  @quotedblleft @quotedblright
+;;  @quoteleft @quoteright  @quotedblbase @quotesinglbase
+;;  @guillemetleft @guillemetright @guilsinglleft @guilsinglright.
+;;  @clicksequence, @click, @clickstyle, @arrow
 
 ;;; Code:
 
-(require 'backquote)
 (require 'texinfmt)
 
+;; Work around a problem that double-quotes at bol disappear:
+;; @dfn{FOO} => FOO", ``BAR'' => BAR", \BAZ/ => BAZ/
+(modify-syntax-entry ?\" "w" texinfo-format-syntax-table)
+(modify-syntax-entry ?\\ "w" texinfo-format-syntax-table)
+
 ;;; Broken
 (defvar ptexinfmt-disable-broken-notice-flag t
   "If non-nil disable notice, when call `ptexinfmt-broken-facility'.
@@ -64,54 +73,54 @@
 
 (put 'ptexinfmt-broken-facility 'lisp-indent-function 'defun)
 (defmacro ptexinfmt-broken-facility (facility docstring assertion
-					      &optional dummy)
+					      &optional _dummy)
   "Declare a symbol FACILITY is broken if ASSERTION is nil.
 DOCSTRING will be printed if ASSERTION is nil and
 `ptexinfmt-disable-broken-notice-flag' is nil."
-  (` (let ((facility '(, facility))
-	   (docstring (, docstring))
-	   (assertion (eval '(, assertion))))
-       (put facility 'broken (not assertion))
-       (if assertion
+  `(let ((facility ',facility)
+	 (docstring ,docstring)
+	 (assertion (eval ',assertion)))
+     (put facility 'broken (not assertion))
+     (if assertion
+	 nil
+       (put facility 'broken-docstring docstring)
+       (if ptexinfmt-disable-broken-notice-flag
 	   nil
-	 (put facility 'broken-docstring docstring)
-	 (if ptexinfmt-disable-broken-notice-flag
-	     nil
-	   (message "BROKEN FACILITY DETECTED: %s" docstring))))))
+	 (message "BROKEN FACILITY DETECTED: %s" docstring)))))
 
 (put 'ptexinfmt-defun-if-broken 'lisp-indent-function 'defun)
 (defmacro ptexinfmt-defun-if-broken (&rest args)
   "Redefine a function just like `defun' if it is considered broken."
   (let ((name (list 'quote (car args))))
     (setq args (cdr args))
-    (` (prog1
-	   (, name)
-	 (if (get (, name) 'broken)
-	     (defalias (, name)
-	       (function (lambda (,@ args)))))))))
+    `(prog1
+	 ,name
+       (if (get ,name 'broken)
+	   (defalias ,name
+	     (function (lambda ,@args)))))))
 
 (put 'ptexinfmt-defun-if-void 'lisp-indent-function 'defun)
 (defmacro ptexinfmt-defun-if-void (&rest args)
   "Define a function just like `defun' unless it is already defined."
   (let ((name (list 'quote (car args))))
     (setq args (cdr args))
-    (` (prog1
-	   (, name)
-	 (if (fboundp (, name))
-	     nil
-	   (defalias (, name)
-	     (function (lambda (,@ args)))))))))
+    `(prog1
+	 ,name
+       (if (fboundp ,name)
+	   nil
+	 (defalias ,name
+	   (function (lambda ,@args)))))))
 
 (put 'ptexinfmt-defvar-if-void 'lisp-indent-function 'defun)
 (defmacro ptexinfmt-defvar-if-void (&rest args)
   "Define a variable just like `defvar' unless it is already defined."
   (let ((name (car args)))
     (setq args (cdr args))
-    (` (prog1
-	   (defvar (, name))
-	 (if (boundp '(, name))
-	     nil
-	   (defvar (, name) (,@ args)))))))
+    `(prog1
+	 (defvar ,name)
+       (if (boundp ',name)
+	   nil
+	 (defvar ,name ,@args)))))
 
 ;; sort -fd
 (ptexinfmt-broken-facility texinfo-format-printindex
@@ -123,7 +132,9 @@
       nil
     t))
 
-;; @var
+;; @var{METASYNTACTIC-VARIABLE}
+(defvar texinfo-enclosure-list)
+(defvar texinfo-alias-list)
 (ptexinfmt-broken-facility texinfo-format-var
   "Don't perse @var argument."
   (condition-case nil
@@ -135,7 +146,8 @@
 	  t))
     (error nil)))
 
-;; @xref
+;; @xref{NODE-NAME[, CROSS-REFERENCE-NAME, TITLE-OR-TOPIC,
+;;     INFO-FILE-NAME, PRINTED-MANUAL-TITLE]}.
 (ptexinfmt-broken-facility texinfo-format-xref
   "Can't format @xref, 1st argument is empty."
   (condition-case nil
@@ -147,7 +159,7 @@
 	  t))
     (error nil)))
 
-;; @uref
+;; @uref{URL[, TEXT][, REPLACEMENT]}
 (ptexinfmt-broken-facility texinfo-format-uref
   "Parse twice @uref argument."
   (condition-case nil
@@ -164,7 +176,10 @@
   "`texinfo-multitable-widths' unsupport wide-char."
   (if (fboundp 'texinfo-multitable-widths)
       (with-temp-buffer
-	(let ((str "幅広文字"))
+	(let ((str (string (make-char 'japanese-jisx0208 73 125)
+			   (make-char 'japanese-jisx0208 57 45)
+			   (make-char 'japanese-jisx0208 74 56)
+			   (make-char 'japanese-jisx0208 59 122))))
 	  (texinfo-mode)
 	  (insert (format " {%s}\n" str))
 	  (goto-char (point-min))
@@ -193,6 +208,7 @@
 (put 'afourwide 'texinfo-format 'texinfo-discard-line)
 (put 'afivepaper 'texinfo-format 'texinfo-discard-line)
 (put 'pagesizes 'texinfo-format 'texinfo-discard-line-with-args)
+(put 'fonttextsize 'texinfo-format 'texinfo-discard-line-with-args)
 
 ;; style
 (put 'setchapternewpage 'texinfo-format 'texinfo-discard-line-with-args)
@@ -202,6 +218,7 @@
 (put 'setcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'setshortcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'novalidate 'texinfo-format 'texinfo-discard-line-with-args)
+(put 'frenchspacing 'texinfo-format 'texinfo-discard-line-with-args)
 
 ;; head & foot
 (put 'headings 'texinfo-format 'texinfo-discard-line-with-args)
@@ -216,9 +233,12 @@
 (put 'page 'texinfo-format 'texinfo-discard-line)
 (put 'hyphenation 'texinfo-format 'texinfo-discard-command-and-arg)
 
-;; @slanted{} (makeinfo 4.8 or later)
+;; @slanted{TEXT} (makeinfo 4.8 or later)
 (put 'slanted 'texinfo-format 'texinfo-format-noop)
 
+;; @sansserif{TEXT} (makeinfo 4.8 or later)
+(put 'sansserif 'texinfo-format 'texinfo-format-noop)
+
 ;; @tie{} (makeinfo 4.3 or later)
 (put 'tie 'texinfo-format 'texinfo-format-tie)
 (ptexinfmt-defun-if-void texinfo-format-tie ()
@@ -227,7 +247,7 @@
 
 
 ;;; Directory File
-;; @direcategory
+;; @direcategory DIRPART
 (put 'dircategory 'texinfo-format 'texinfo-format-dircategory)
 (ptexinfmt-defun-if-void texinfo-format-dircategory ()
   (let ((str (texinfo-parse-arg-discard)))
@@ -237,7 +257,7 @@
 		     (point)))
     (insert "INFO-DIR-SECTION " str "\n")))
 
-;; @direntry
+;; @direntry ... @end direntry
 (put 'direntry 'texinfo-format 'texinfo-format-direntry)
 (ptexinfmt-defun-if-void texinfo-format-direntry ()
   (texinfo-push-stack 'direntry nil)
@@ -330,22 +350,28 @@
 
 
 ;;; Marking
-;; @indicateurl, @url, @env, @command, 
+;; @env{ENVIRONMENT-VARIABLE}
 (put 'env 'texinfo-format 'texinfo-format-code)
+
+;; @command{COMMAND-NAME}
 (put 'command 'texinfo-format 'texinfo-format-code)
 
+;; @indicateurl{INDICATEURL}
 (put 'indicateurl 'texinfo-format 'texinfo-format-code)
+
+;; @url{URL[, DISPLAYED-TEXT][, REPLACEMENT}
 (put 'url 'texinfo-format 'texinfo-format-uref)	; Texinfo 4.7
 
-;; @acronym
+;; @acronym{ACRONYM}
 (put 'acronym 'texinfo-format 'texinfo-format-var)
 
+;; @var{METASYNTACTIC-VARIABLE}
 (ptexinfmt-defun-if-broken texinfo-format-var ()
   (let ((arg (texinfo-parse-expanded-arg)))
     (texinfo-discard-command)
     (insert (upcase arg))))
 
-;; @key
+;; @key{KEY-NAME}
 (put 'key 'texinfo-format 'texinfo-format-key)
 (ptexinfmt-defun-if-void texinfo-format-key ()
   (insert (texinfo-parse-arg-discard))
@@ -363,7 +389,7 @@
 	(insert (nth 1 args) " <" (nth 0 args) ">")
       (insert "<" (nth 0 args) ">"))))
 
-;; @option
+;; @option{OPTION-NAME}
 (put 'option 'texinfo-format 'texinfo-format-option)
 (ptexinfmt-defun-if-void texinfo-format-option ()
   "Insert ` ... ' around arg unless inside a table; in that case, no quotes."
@@ -392,24 +418,31 @@
       (error "Not found: @verb start brace"))
     (delete-region texinfo-command-start (+ 2 texinfo-command-end))
     (search-forward  delimiter))
-  (delete-backward-char 1)
+  (delete-char -1)
   (unless (looking-at "}")
     (error "Not found: @verb end brace"))
   (delete-char 1))
 
 
-;;; @LaTeX, @registeredsymbol{}
+;; @LaTeX{}
 (put 'LaTeX 'texinfo-format 'texinfo-format-LaTeX)
 (ptexinfmt-defun-if-void texinfo-format-LaTeX ()
   (texinfo-parse-arg-discard)
   (insert "LaTeX"))
 
+;; @registeredsymbol{}
 (put 'registeredsymbol 'texinfo-format 'texinfo-format-registeredsymbol)
 (ptexinfmt-defun-if-void texinfo-format-registeredsymbol ()
   (texinfo-parse-arg-discard)
   (insert "(R)"))
 
 ;;; Accents and Special characters
+;; @euro{}	==>	Euro
+(put 'euro 'texinfo-format 'texinfo-format-euro)
+(ptexinfmt-defun-if-void texinfo-format-euro ()
+  (texinfo-parse-arg-discard)
+  (insert "Euro "))
+
 ;; @pounds{}	==>	#	Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()
@@ -420,7 +453,7 @@
 (put 'ordf 'texinfo-format 'texinfo-format-ordf)
 (ptexinfmt-defun-if-void texinfo-format-ordf ()
   (texinfo-parse-arg-discard)
-  (insert "o"))
+  (insert "a"))
 
 ;; @ordm{}	==>	o	Spanish masculine
 (put 'ordm 'texinfo-format 'texinfo-format-ordm)
@@ -507,7 +540,7 @@
   (goto-char texinfo-command-start))
 
 ;; @,{c}	==>	c,	cedilla accent
-(put ', 'texinfo-format 'texinfo-format-cedilla-accent)
+(put '\, 'texinfo-format 'texinfo-format-cedilla-accent)
 (ptexinfmt-defun-if-void texinfo-format-cedilla-accent ()
   (insert (texinfo-parse-arg-discard) ",")
   (goto-char texinfo-command-start))
@@ -588,9 +621,28 @@
 (ptexinfmt-defun-if-void texinfo-format-\/ ()
   (texinfo-discard-command))
 
+;; @textdegree{}
+(put 'textdegree 'texinfo-format 'texinfo-format-textdegree)
+(ptexinfmt-defun-if-void texinfo-format-textdegree ()
+  (insert "o" (texinfo-parse-arg-discard))
+  (goto-char texinfo-command-start))
+
+;; @geq{}
+(put 'geq 'texinfo-format 'texinfo-format-geq)
+(ptexinfmt-defun-if-void texinfo-format-geq ()
+  (insert ">=" (texinfo-parse-arg-discard))
+  (goto-char texinfo-command-start))
+
+;; @leq{}
+(put 'leq 'texinfo-format 'texinfo-format-leq)
+(ptexinfmt-defun-if-void texinfo-format-leq ()
+  (insert "<=" (texinfo-parse-arg-discard))
+  (goto-char texinfo-command-start))
+
 
 ;;; Cross References
-;; @ref, @xref
+;; @ref{NODE-NAME, ...}
+;; @xref{NODE-NAME, ...}
 (put 'ref 'texinfo-format 'texinfo-format-xref)
 
 (ptexinfmt-defun-if-broken texinfo-format-xref ()
@@ -619,7 +671,7 @@
 	(insert  (nth 1 args) " (" (nth 0 args) ")")
       (insert "`" (nth 0 args) "'"))))
 
-;; @inforef
+;; @inforef{NODE-NAME, CROSS-REFERENCE-NAME, INFO-FILE-NAME}
 (put 'inforef 'texinfo-format 'texinfo-format-inforef)
 (ptexinfmt-defun-if-void texinfo-format-inforef ()
   (let ((args (texinfo-format-parse-args)))
@@ -629,7 +681,7 @@
       (insert "*Note " "(" (nth 2 args) ")" (car args) "::"))))
 
 
-;; @anchor
+;; @anchor{NAME}
 ;; don't emulation
 ;; If support @anchor for Mule 2.3, We must fix informat.el and info.el:
 ;;  - Info-tagify suport @anthor-*-refill.
@@ -947,6 +999,87 @@
 	(texinfo-sort-region opoint (point))
       (shell-command-on-region opoint (point) "sort -fd" 1))))
 
+
+;; @copying ... @end copying
+;; that Emacs 21.4 and lesser and XEmacs don't support.
+(if (fboundp 'texinfo-copying)
+    nil
+  (defvar texinfo-copying-text ""
+    "Text of the copyright notice and copying permissions.")
+
+  (defun texinfo-copying ()
+    "Copy the copyright notice and copying permissions from the Texinfo file,
+as indicated by the @copying ... @end copying command;
+insert the text with the @insertcopying command."
+    (let ((beg (progn (beginning-of-line) (point)))
+	  (end  (progn (re-search-forward "^@end copying[ \t]*\n") (point))))
+      (setq texinfo-copying-text
+	    (buffer-substring-no-properties
+	     (save-excursion (goto-char beg) (forward-line 1) (point))
+	     (save-excursion (goto-char end) (forward-line -1) (point))))
+      (delete-region beg end)))
+
+  (defun texinfo-insertcopying ()
+    "Insert the copyright notice and copying permissions from the Texinfo file,
+which are indicated by the @copying ... @end copying command."
+    (insert (concat "\n" texinfo-copying-text)))
+
+  (defadvice texinfo-format-scan (before expand-@copying-section activate)
+    "Extract @copying and replace @insertcopying with it."
+    (goto-char (point-min))
+    (when (search-forward "@copying" nil t)
+      (texinfo-copying))
+    (while (search-forward "@insertcopying" nil t)
+      (delete-region (match-beginning 0) (match-end 0))
+      (texinfo-insertcopying))))
+
+
+;; @comma
+(if (fboundp 'texinfo-format-comma)
+    nil
+  (put 'comma 'texinfo-format 'texinfo-format-comma)
+  (defun texinfo-format-comma ()
+    (texinfo-parse-arg-discard)
+    (insert ",")
+    (put-text-property (1- (point)) (point) 'ignore t))
+
+  ;; Redefine this function so as to work for @comma
+  (defun texinfo-format-parse-args ()
+    (let ((start (1- (point)))
+	  next beg end
+	  args)
+      (search-forward "{")
+      (save-excursion
+	(texinfo-format-expand-region
+	 (point)
+	 (save-excursion (up-list 1) (1- (point)))))
+      ;; The following does not handle cross references of the form:
+      ;; `@xref{bullet, , @code{@@bullet}@{@}}.' because the
+      ;; re-search-forward finds the first right brace after the second
+      ;; comma.
+      (while (/= (preceding-char) ?\})
+	(skip-chars-forward " \t\n")
+	(setq beg (point))
+;;;	(re-search-forward "[},]")
+	;; Ignore commas that are derived from @comma{}.
+	(while (and (re-search-forward "[},]" nil t)
+		    (get-text-property (match-beginning 0) 'ignore)))
+;;;
+	(setq next (point))
+	(forward-char -1)
+	(skip-chars-backward " \t\n")
+	(setq end (point))
+	(cond ((< beg end)
+	       (goto-char beg)
+	       (while (search-forward "\n" end t)
+		 (replace-match " "))))
+	(push (if (> end beg) (buffer-substring-no-properties beg end))
+	      args)
+	(goto-char next))
+      ;;(if (eolp) (forward-char 1))
+      (setq texinfo-command-end (point))
+      (nreverse args))))
+
 (provide 'ptexinfmt)
 
 ;;; ptexinfmt.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/doc/txi-en.tex /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/txi-en.tex
--- work/emacs-w3m-1.4.4/doc/txi-en.tex	2002-11-30 00:28:40.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/doc/txi-en.tex	2005-07-06 08:52:28.000000000 +0900
@@ -16,7 +16,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+% 02110-1301, USA.
 
 \gdef\putwordAppendix{Appendix}
 \gdef\putwordChapter{Chapter}
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: antenna-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: back-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: back-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: copy-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: db-history-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: forward-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: forward-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: history-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: home-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: image-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: open-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: parent-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: parent-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: reload-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: search-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: state-00.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: state-01.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: state-10.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: state-11.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons: weather-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: antenna-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: back-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: back-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: copy-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: db-history-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: forward-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: forward-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: history-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: home-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: image-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: open-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: parent-disabled.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: parent-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: reload-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: search-up.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: state-00.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: state-01.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: state-10.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: state-11.png
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/icons30: weather-up.png
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/mew-w3m.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mew-w3m.el
--- work/emacs-w3m-1.4.4/mew-w3m.el	2005-03-24 17:01:11.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mew-w3m.el	2010-01-13 09:59:40.000000000 +0900
@@ -1,12 +1,12 @@
 ;; mew-w3m.el --- View Text/Html content with w3m in Mew
 
-;; Copyright (C) 2001, 2002, 2003, 2004
+;; 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.53.2.2 $
+;; Version: $Revision: 1.69 $
 ;; Keywords: Mew, mail, w3m, WWW, hypermedia
 
 ;; This file is a part of emacs-w3m.
@@ -22,9 +22,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -107,6 +107,13 @@
   :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.
@@ -119,6 +126,11 @@
     (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)
@@ -139,18 +151,67 @@
 	     (mew-w3m-auto-insert-image t)
 	     (mew-w3m-use-safe-url-regexp nil))
 	 (mew-summary-display 'force))
-     (save-excursion
-       (set-buffer (mew-buffer-message))
+     (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
-	  (put-text-property (point-min) (1+ (point-min))
-			     'w3m-images (not image))
+	  (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."
@@ -208,27 +269,23 @@
 			 "-o" "ext_halfdump=1"
 			 "-o" "pre_conv=1"
 			 "-o" "strict_iso2022=0")))
-	   (w3m-region begin end xref)))
+	   (mew-w3m-region begin end xref)))
 	((null cache)	;; Mew-2 + w3m, w3mmee
-	 (w3m-region begin end xref (mew-charset-guess-region begin end)))
+	 (mew-w3m-region begin end xref (mew-charset-guess-region begin end)))
 	(t		;; Old Mew
 	 (setq charset (or (mew-syntax-get-param params "charset")
-			   (save-excursion
-			     (set-buffer cache)
+			   (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
-	  (w3m-region (point)
-		      (progn (insert-buffer-substring cache begin end)
-			     (point))
-		      xref))))
-       (put-text-property (point-min) (1+ (point-min)) 'w3m t)
-       (put-text-property (point-min) (1+ (point-min))
-			  'w3m-images mew-w3m-auto-insert-image)))))
-
+	     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)))
@@ -239,25 +296,24 @@
       (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))))
-	  (set-buffer fld)
-	  (let* ((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)))))))))
+	(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)
@@ -280,6 +336,138 @@
 	(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)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/mime-w3m.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mime-w3m.el
--- work/emacs-w3m-1.4.4/mime-w3m.el	2005-02-16 17:21:02.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mime-w3m.el	2013-05-30 16:59:52.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; mime-w3m.el --- mime-view content filter for text
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2005, 2009, 2010, 2012, 2013
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
@@ -20,19 +20,16 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
-;;; Install:
-
-;; (1) Install SEMI.
-;; (2) Put this file to appropriate directory.
-;; (3) Write these following code to your ~/.emacs or ~/.gnus.
+;; To use this module along with a SEMI-based mail client (e.g.
+;; Wanderlust), add this one to your ~/.emacs file or ~/.wl.el file:
 ;;
-;;        (require 'mime-w3m)
-
+;; (require 'mime-w3m)
 
 ;;; Code:
 
@@ -104,16 +101,17 @@
   (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))))
+      (w3m-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
@@ -128,7 +126,7 @@
 	   (set-alist 'mime-view-type-subtype-score-alist
 		      '(text . html) 3))))))
 
-(defsubst mime-w3m-setup ()
+(defun mime-w3m-setup ()
   "Setup `mime-w3m' module."
   (require 'w3m)
   (when (eq mime-w3m-display-inline-images 'default)
@@ -147,30 +145,6 @@
 	   (font-set-face-background 'default color (current-buffer))))
     (cons 'progn body)))
 
-(unless (or (featurep 'xemacs)
-	    (>= emacs-major-version 21))
-  (defvar mime-w3m-mode-map nil
-    "Keymap for text/html part rendered by `mime-w3m-preview-text/html'.
-This map is overwritten by `mime-w3m-local-map-property' based on the
-value of `w3m-minor-mode-map'.  Therefore, in order to add some
-commands to this map, add them to `w3m-minor-mode-map' instead of this
-map."))
-
-(eval-when-compile
-  (defvar mime-w3m-mode-map))
-
-(defsubst mime-w3m-local-map-property ()
-  (if (or (featurep 'xemacs)
-	  (>= emacs-major-version 21))
-      (list 'keymap w3m-minor-mode-map)
-    (list 'local-map
-	  (or mime-w3m-mode-map
-	      (progn
-		(setq mime-w3m-mode-map (copy-keymap w3m-minor-mode-map))
-		(set-keymap-parent mime-w3m-mode-map
-				   mime-view-mode-default-map)
-		mime-w3m-mode-map)))))
-
 ;;;###autoload
 (defun mime-w3m-preview-text/html (entity situation)
   (mime-w3m-setup)
@@ -199,20 +173,20 @@
 			  (mime-entity-content-type entity)
 			  "charset"))
 	     (add-text-properties p (point-max)
-				  (nconc (mime-w3m-local-map-property)
-					 '(text-rendered-by-mime-w3m t))))
+				  (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)
+    (after add-emacs-w3m-functions-to-pre/post-command-hook activate compile)
     "Advised by emacs-w3m.
-Set hooks run arround each command is executed."
+Add some emacs-w3m utility functions to pre/post-command-hook."
     (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))))
+      (w3m-make-local-hook 'pre-command-hook)
+      (w3m-make-local-hook 'post-command-hook)
+      (add-hook 'pre-command-hook 'w3m-store-current-position nil t)
+      (add-hook 'post-command-hook 'mime-w3m-check-current-position nil t))))
 
 (defun mime-w3m-check-current-position ()
   "Run `mime-w3m-after-cursor-move-hook' if the cursor has been moved."
@@ -234,7 +208,13 @@
       (w3m-insert-string (mime-entity-content entity))
       (mime-entity-type/subtype entity))))
 
-(let (current-load-list)
+(eval
+ (quote
+  ;; Arglist varies according to Emacs version.
+  ;; Emacs 21.1~21.4, 23.3, 24, XEmacs, SXEmacs:
+  ;; (kill-new string &optional replace)
+  ;; Emacs 22.1~23.2:
+  ;; (kill-new string &optional replace yank-handler)
   (defadvice kill-new (before strip-keymap-properties-from-kill activate)
     "Advised by emacs-w3m.
 Strip `keymap' or `local-map' properties from a killed string."
@@ -242,7 +222,7 @@
 			   '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)))))
+				(ad-get-arg 0))))))
 
 (mime-w3m-insinuate)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/mkinstalldirs /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mkinstalldirs
--- work/emacs-w3m-1.4.4/mkinstalldirs	2002-11-15 14:10:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/mkinstalldirs	2008-02-06 11:24:18.000000000 +0900
@@ -1,38 +1,152 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
 
+scriptversion=2006-05-11.19
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit $?
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
 
 for file
 do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
 
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-	  errstatus=$lasterr
-        fi
-     fi
+for file
+do
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
+  shift
+  IFS=$oIFS
+
+  for d
+  do
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+	errstatus=$lasterr
+      else
+	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
+      fi
+    fi
 
-     pathcomp="$pathcomp/"
-   done
+    pathcomp=$pathcomp/
+  done
 done
 
 exit $errstatus
-
-# mkinstalldirs ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/octet.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/octet.el
--- work/emacs-w3m-1.4.4/octet.el	2005-02-15 20:04:44.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/octet.el	2010-08-18 14:23:21.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; octet.el --- An octet stream viewer.
 
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005, 2010
 ;; Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
@@ -194,7 +194,8 @@
     (funcall (symbol-function 'w3m-region)
 	     beg end (concat "about://octet-attachments/"
 			     (base64-encode-string
-			      (buffer-name (current-buffer))) "/"))
+			      (string-as-unibyte
+			       (buffer-name (current-buffer))) "/")))
     (setq octet-attachments nil))
   0)
 
@@ -214,7 +215,7 @@
 		       0)
 	      1))
 	1))))
- ((>= emacs-major-version 21)
+ (t
   (defun octet-decode-image (ignore &rest args)
     (let (image)
       (if (image-type-available-p (car args))
@@ -224,9 +225,7 @@
 		(progn (erase-buffer)
 		       (insert-image image) 0)
 	      1))
-	1))))
- (t
-  (defalias 'octet-decode-image 'ignore)))
+	1)))))
 
 (defun octet-decode-u8-text (&rest args)
   (let ((string (buffer-string)))
@@ -404,7 +403,7 @@
 	(with-current-buffer from
 	  (if (setq extent (extent-at (point-min) nil nil nil 'at))
 	      (setq glyph (extent-end-glyph extent))))
-	(insert-buffer from)
+	(insert-buffer-substring from)
 	(if glyph
 	    (set-extent-end-glyph (make-extent (point) (point))
 				  glyph))))
@@ -416,7 +415,7 @@
   (interactive "fFilename: ")
   (as-binary-input-file	(find-file file))
   (unwind-protect
-      (let (buffer-read-only)
+      (let ((inhibit-read-only t))
 	(octet-buffer))
     (goto-char (point-min))
     (set-buffer-modified-p nil)
Only in work/emacs-w3m-1.4.4/: octet.elc
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/patches: dot-domain.patch
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/patches/file-progress.patch /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/patches/file-progress.patch
--- work/emacs-w3m-1.4.4/patches/file-progress.patch	2003-10-03 12:06:16.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/patches/file-progress.patch	2006-12-08 10:20:26.000000000 +0900
@@ -1,6 +1,6 @@
---- file.c	26 Sep 2003 17:59:51 -0000	1.229
-+++ file.c	2 Oct 2003 01:09:08 -0000
-@@ -6582,6 +6582,8 @@
+--- w3m-0.5.1/file.c~	2004-04-16 18:47:19 +0000
++++ w3m-0.5.1/file.c	2006-12-08 01:04:52 +0000
+@@ -6602,6 +6602,8 @@
  	if (src)
  	    Strfputs(lineBuf2, src);
  	linelen += lineBuf2->length;
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/patches: italic-text.patch
Only in work/emacs-w3m-1.4.4/patches: mule-2.3@19.34.patch
Only in work/emacs-w3m-1.4.4/patches: no-proxy.patch
Only in work/emacs-w3m-1.4.4/patches: w3m-0.2.1-inu-1.5-solaris-xemacs.patch
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: .cvsignore
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/mew-shimbun.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/mew-shimbun.el
--- work/emacs-w3m-1.4.4/shimbun/mew-shimbun.el	2005-03-16 06:49:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/mew-shimbun.el	2010-01-13 09:59:30.000000000 +0900
@@ -1,7 +1,7 @@
 ;; -*- mode: emacs-lisp -*-
 ;; mew-shimbun.el --- View shimbun contents with Mew
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
@@ -21,9 +21,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 `Shimbun' interface for Mew version 2.1 or later.
@@ -296,6 +296,18 @@
     (unless (mew-sinfo-get-summary-form)
       (mew-sinfo-set-summary-form (mew-get-summary-form fld)))))
 
+(static-if (fboundp 'mew-expand-file)
+    ;; Mew 5
+    (defalias 'mew-shimbun-folder-file 'mew-expand-file)
+  (defun mew-shimbun-folder-file (fld file)
+    (expand-file-name file (mew-expand-folder fld))))
+
+(static-if (fboundp 'mew-expand-msg)
+    ;; Mew 5
+    (defalias 'mew-shimbun-expand-msg 'mew-expand-msg)
+  (defun mew-shimbun-expand-msg (fld msg)
+    (expand-file-name msg (mew-expand-folder fld))))
+
 (if (featurep 'xemacs)
     nil
   (eval-and-compile
@@ -356,7 +368,7 @@
 		    (when (re-search-forward (or mew-shimbun-unseen-regex
 						 (mew-shimbun-unseen-regex)) nil t)
 		      (setq sbflds (cons fld sbflds))))
-		(setq cfile (mew-expand-folder fld mew-summary-cache-file))
+		(setq cfile (mew-shimbun-folder-file fld mew-summary-cache-file))
 		(when (file-readable-p cfile)
 		  (with-temp-buffer
 		    (mew-frwlet
@@ -366,10 +378,10 @@
 		     (when (re-search-forward (or mew-shimbun-unseen-regex
 						  (mew-shimbun-unseen-regex)) nil t)
 		       (setq sbflds (cons fld sbflds))))))))))))
-    (mapcar (lambda (x)
-	      (unless (member x removes)
-		(setq alst (cons (list x) alst))))
-	    sbflds)
+    (mapc (lambda (x)
+	    (unless (member x removes)
+	      (setq alst (cons (list x) alst))))
+	  sbflds)
     (let ((completion-ignore-case mew-complete-folder-ignore-case))
       (setq fld (completing-read
 		 (if args
@@ -390,7 +402,7 @@
 	  (mew-summary-ls newfld newfld))))))
 
 ;;;###autoload
-(defun mew-shimbun-retrieve ()
+(defun mew-shimbun-retrieve (&optional newfld)
   "Retrieve articles via SHIMBUN on this folder."
   (interactive)
   (when (mew-summary-exclusive-p)
@@ -414,7 +426,7 @@
 	       (mew-shimbun-element-body sgr group server
 		 (setq count
 		       (+ (mew-shimbun-retrieve-article
-			   mua server group range fld)
+			   mua server group range fld newfld)
 			  count)))))
 	   (run-hooks 'mew-shimbun-retrieve-hook)
 	   (message "Getting %s %s in '%s' done"
@@ -431,7 +443,7 @@
   (mew-summary-only
    (let ((mua (luna-make-entity 'shimbun-mew-mua))
 	 (cfld (mew-summary-folder-name 'ext))
-	 fld dir server group range)
+	 fld dir server group range newfld)
      (run-hooks 'mew-shimbun-before-retrieve-hook)
      (mew-window-configure 'summary)
      (mew-current-set nil nil nil)
@@ -442,17 +454,18 @@
 			   (car fldgrp)))
 	 (setq dir (mew-expand-folder fld))
 	 (unless (file-directory-p dir)
-	   (mew-make-directory dir))
+	   (mew-make-directory dir)
+	   (setq newfld t))
 	 (mew-shimbun-visit-folder fld)
 	 (sit-for 0.5)
 	 (mew-rendezvous mew-summary-buffer-process)
-	 (mew-shimbun-retrieve)
+	 (mew-shimbun-retrieve newfld)
 	 (unless (eq (get-buffer cfld) (current-buffer))
 	   (mew-kill-buffer (current-buffer)))))
      (mew-shimbun-visit-folder cfld)
      (message "Getting done"))))
 
-(defun mew-shimbun-retrieve-article (mua server group range fld)
+(defun mew-shimbun-retrieve-article (mua server group range fld &optional newfld)
   "Retrieve articles via SHIMBUN."
   (luna-define-method shimbun-mua-search-id ((mua shimbun-mew-mua) id)
     (let ((shimbun (shimbun-mua-shimbun mua)))
@@ -468,7 +481,7 @@
 		  mew-use-biff))
 	(count 0)
 	(dispcount 0)
-	newfld msg file)
+	msg file)
     (if biff (mew-biff-clean-up))
     (shimbun-open-group shimbun group)
     (unless (file-exists-p (mew-expand-folder fld))
@@ -501,7 +514,7 @@
 		    (insert (format "X-Shimbun-Id: %s\n" id))
 		    (mew-shimbun-sanity-convert)
 		    (setq msg (mew-folder-new-message fld 'numonly))
-		    (setq file (mew-expand-folder fld msg))
+		    (setq file (mew-shimbun-expand-msg fld msg))
 		    (mew-frwlet
 		     mew-cs-dummy mew-cs-text-for-write
 		     (write-region (point-min) (point-max) file nil 'nomsg))
@@ -662,7 +675,7 @@
 		  (setq newcount (1+ newcount))
 		  (setq msg (mew-folder-new-message fld 'numonly))
 		  (setq oldmd5 nil))
-		(setq file (mew-expand-folder fld msg))
+		(setq file (mew-shimbun-expand-msg fld msg))
 		(setq buf (get-buffer-create mew-shimbun-article-buffer-name))
 		(with-current-buffer buf
 		  (mew-erase-buffer)
@@ -790,7 +803,7 @@
 		     (mew-elet
 		      (delete-region (point)
 				     (progn (forward-line) (point)))))
-		   (setq file (mew-expand-folder fld msg))
+		   (setq file (mew-shimbun-expand-msg fld msg))
 		   (when (and (file-exists-p file)
 			      (file-readable-p file)
 			      (file-writable-p file))
@@ -1010,10 +1023,10 @@
 	(forward-line)
 	(mew-header-goto-next)
 	(delete-region beg (point)))
-      (mew-md5
-       (string-as-unibyte
-	(mew-buffer-substring (point-min)
-			      (min (point-max) (+ (point-min) 4096))))))))
+      (md5 (string-as-unibyte
+	    (mew-buffer-substring (point-min)
+				  (min (point-max) (+ (point-min) 4096))))
+	   nil nil 'binary))))
 
 (defvar mew-shimbun-touch-folder-p
   (static-if (boundp 'mew-touch-folder-p)
@@ -1071,14 +1084,13 @@
 	(let* ((buf (or buf (current-buffer)))
 	       (fld (if (bufferp buf) (buffer-name buf) buf)))
 	  (when (and (get-buffer buf) (mew-shimbun-folder-p fld))
-	    (save-excursion
-	      (set-buffer buf)
+	    (with-current-buffer buf
 	      (unless (mew-summary-folder-dir-newp)
 		(mew-summary-folder-cache-save))))))
 
       ;; "Q" or exit Emacs
       (defadvice mew-mark-clean-up (before shimbun-cache-save activate)
-	(save-excursion
+	(save-current-buffer
 	  (dolist (fld mew-buffers)
 	    (when (and (get-buffer fld) (mew-shimbun-folder-p fld))
 	      (set-buffer fld)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/nnshimbun.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/nnshimbun.el
--- work/emacs-w3m-1.4.4/shimbun/nnshimbun.el	2005-03-23 12:56:11.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/nnshimbun.el	2012-02-16 08:15:55.000000000 +0900
@@ -1,10 +1,9 @@
 ;;; nnshimbun.el --- interfacing with web newspapers
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2000-2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;          Akihiro Arisawa    <ari@atesoft.advantest.co.jp>,
+;;          ARISAWA Akihiro    <ari@mbf.sphere.ne.jp>,
 ;;          Katsumi Yamaoka    <yamaoka@jpl.org>,
 ;;          Yuuichi Teranishi  <teranisi@gohome.org>
 ;; Keywords: news
@@ -22,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -41,6 +40,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
 
 (require 'nnoo)
 (require 'nnheader)
@@ -65,14 +65,30 @@
        (signal (car err) (cdr err))))))
 
 (require 'shimbun)
+
 (eval-and-compile
   (autoload 'gnus-declare-backend "gnus-start")
+  (autoload 'gnus-ephemeral-group-p "gnus")
+  (autoload 'gnus-group-change-level "gnus-start")
+  (autoload 'gnus-group-goto-group "gnus-group")
+  (autoload 'gnus-group-group-level "gnus-group")
+  (autoload 'gnus-group-insert-group-line-info "gnus-group")
   (autoload 'gnus-group-make-group "gnus-group")
+  (autoload 'gnus-group-prefixed-name "gnus")
+  (autoload 'gnus-group-read-ephemeral-group "gnus-group")
+  (autoload 'gnus-group-remove-mark "gnus-group")
   (autoload 'gnus-group-short-name "gnus")
+  (autoload 'gnus-group-update-group-line "gnus-group")
+  (autoload 'gnus-kill-ephemeral-group "gnus")
   (autoload 'gnus-summary-refer-article "gnus-sum")
   (autoload 'message-make-date "message")
   (autoload 'parse-time-string "parse-time"))
 
+(eval-when-compile
+  (defvar gnus-level-default-subscribed)
+  (defvar gnus-level-killed)
+  (defvar gnus-level-subscribed))
+
 (defgroup nnshimbun nil
   "Reading web contents with Gnus."
   :group 'gnus)
@@ -102,6 +118,13 @@
   :group 'nnshimbun
   :type 'boolean)
 
+(defcustom nnshimbun-default-group-level nil
+  "Integer specifies the default nnshimbun group level or nil.
+It is applied when an nnshimbun group is newly created.  If it is nil,
+the value of `gnus-level-default-subscribed' will be used."
+  :group 'nnshimbun
+  :type '(radio (const :format "%v  " nil) (integer :value 3)))
+
 
 ;; The nnshimbun group parameter:
 
@@ -248,7 +271,7 @@
 
 (defvoo nnshimbun-directory (nnheader-concat gnus-directory "shimbun/")
   "*Directory where nnshimbun will store NOV files.
-Actually, you can find the NOV file in the SERVER/GROUP/ subdirectory.")
+Actually, you can find those files in the SERVER/GROUP/ subdirectory.")
 
 (defvoo nnshimbun-nov-is-evil nil
   "*If non-nil, nnshimbun won't use the NOV databases to retrieve headers.")
@@ -267,7 +290,7 @@
 You can use the `encapsulate-images' nnshimbun group parameter for
 each nnshimbun group.")
 
-(defvoo nnshimbun-index-range nil
+(defvoo nnshimbun-index-range 2
   "*The number of indices that should be checked to detect new articles.
 `all' or nil is for all indices, `last' is for the last index, and an
 integer N is for the last N pages of indices.  This simply provides a
@@ -285,17 +308,17 @@
 (defmacro nnshimbun-current-server ()
   '(nnoo-current-server 'nnshimbun))
 
-(defmacro nnshimbun-server-directory (&optional server)
-  `(file-name-as-directory
-    (expand-file-name ,(or server '(nnshimbun-current-server))
-		      nnshimbun-directory)))
-
 (defmacro nnshimbun-current-group ()
   '(shimbun-current-group nnshimbun-shimbun))
 
-(defmacro nnshimbun-current-directory (&optional group)
-  `(nnmail-group-pathname ,(or group '(nnshimbun-current-group))
-			  (nnshimbun-server-directory)))
+(defun nnshimbun-group-prefixed-name (group &optional server)
+  (gnus-group-prefixed-name (or group (nnshimbun-current-group))
+			    (list 'nnshimbun
+				  (or server (nnshimbun-current-server)))))
+
+(defun nnshimbun-group-ephemeral-p (group)
+  (gnus-ephemeral-group-p (nnshimbun-group-prefixed-name
+			   group (shimbun-server nnshimbun-shimbun))))
 
 (defmacro nnshimbun-backlog (&rest form)
   `(let ((gnus-keep-backlog nnshimbun-keep-backlog)
@@ -315,7 +338,7 @@
 If FULL-NAME-P is non-nil, it assumes that GROUP is a full name."
   (let ((name (if full-name-p
 		  group
-		`(concat "nnshimbun+" (nnshimbun-current-server) ":" ,group))))
+		`(nnshimbun-group-prefixed-name ,group))))
     (cond ((eq 'index-range (eval symbol))
 	   `(or (plist-get (nnshimbun-find-group-parameters ,name)
 			   'index-range)
@@ -351,6 +374,19 @@
       (mm-decode-coding-string group 'utf-8)
     group))
 
+(defun nnshimbun-nov-buffer-name (&optional group)
+  (format " *nnshimbun overview %s %s*"
+	  (nnshimbun-current-server)
+	  (or group (nnshimbun-current-group))))
+
+(defun nnshimbun-group-pathname (&optional group file)
+  "Return an absolute file name of FILE for GROUP."
+  (nnmail-group-pathname (or group (nnshimbun-current-group))
+			 (expand-file-name (nnshimbun-current-server)
+					   nnshimbun-directory)
+			 file))
+
+
 ;; Interface functions:
 
 (nnoo-define-basics nnshimbun)
@@ -360,69 +396,32 @@
 	    (nnshimbun-open-server server)
 	  nnshimbun-shimbun)
     (or (not group)
-	(when (condition-case err
-		  (shimbun-open-group nnshimbun-shimbun group)
-		(error
-		 (nnheader-report 'nnshimbun "%s" (error-message-string err))))
-	  (let ((file-name-coding-system nnmail-pathname-coding-system)
-		(pathname-coding-system nnmail-pathname-coding-system)
-		(dir (nnshimbun-current-directory group)))
-	    (or (file-directory-p dir)
-		(ignore-errors
-		  (make-directory dir t)
-		  (file-directory-p dir))
-		(nnheader-report 'nnshimbun
-				 (if (file-exists-p dir)
-				     "Not a directory: %s"
-				   "Couldn't create directory: %s")
-				 dir)))))))
+	(condition-case err
+	    (shimbun-open-group nnshimbun-shimbun group)
+	  (error
+	   (nnheader-report 'nnshimbun "%s" (error-message-string err)))))))
 
 (deffoo nnshimbun-open-server (server &optional defs)
   (or (nnshimbun-server-opened server)
       (let ((file-name-coding-system nnmail-pathname-coding-system)
-	    (pathname-coding-system nnmail-pathname-coding-system)
-	    (shimbun))
+	    shimbun)
 	(when (condition-case err
 		  (setq shimbun
-			(shimbun-open server
+			(shimbun-open (or (cadr (assq 'nnshimbun-address defs))
+					  server)
 				      (luna-make-entity 'shimbun-gnus-mua)))
 		(error
 		 (nnheader-report 'nnshimbun "%s" (error-message-string err))))
 	  (nnoo-change-server 'nnshimbun server
 			      (cons (list 'nnshimbun-shimbun shimbun) defs))
-	  (when (or (file-directory-p nnshimbun-directory)
-		    (ignore-errors
-		      (make-directory nnshimbun-directory)
-		      (file-directory-p nnshimbun-directory))
-		    (progn
-		      (nnshimbun-close-server)
-		      (nnheader-report 'nnshimbun
-				       (if (file-exists-p nnshimbun-directory)
-					   "Not a directory: %s"
-					 "Couldn't create directory: %s")
-				       nnshimbun-directory)))
-	    (let ((dir (nnshimbun-server-directory server)))
-	      (when (or (file-directory-p dir)
-			(ignore-errors
-			  (make-directory dir)
-			  (file-directory-p dir))
-			(progn
-			  (nnshimbun-close-server)
-			  (nnheader-report 'nnshimbun
-					   (if (file-exists-p dir)
-					       "Not a directory: %s"
-					     "Couldn't create directory: %s")
-					   dir)))
-		(nnheader-report 'nnshimbun
-				 "Opened server %s using directory %s"
-				 server dir)
-		t)))))))
+	  t))))
 
 (deffoo nnshimbun-close-server (&optional server)
   (when (nnshimbun-server-opened server)
     (when nnshimbun-shimbun
       (dolist (group (shimbun-groups nnshimbun-shimbun))
-	(nnshimbun-write-nov group t))
+	(when (buffer-live-p (nnshimbun-nov-buffer-name group))
+	  (nnshimbun-write-nov group t)))
       (shimbun-close nnshimbun-shimbun)))
   (nnshimbun-backlog (gnus-backlog-shutdown))
   (nnoo-close-server 'nnshimbun server)
@@ -487,12 +486,15 @@
       (nnheader-report 'nnshimbun "Couldn't retrieve article: %s"
 		       (prin1-to-string article)))))
 
-(deffoo nnshimbun-request-group (group &optional server dont-check)
+(deffoo nnshimbun-request-group (group &optional server dont-check info)
   (setq group (nnshimbun-decode-group-name group))
   (if (not (nnshimbun-possibly-change-group group server))
-      (nnheader-report 'nnshimbun "Invalid group (no such directory)")
+      (nnheader-report 'nnshimbun "Invalid group")
     (let (beg end lines)
       (with-current-buffer (nnshimbun-open-nov group)
+	(when (and (nnshimbun-group-ephemeral-p group)
+		   (zerop (buffer-size)))
+	  (nnshimbun-generate-nov-database group))
 	(goto-char (point-min))
 	(setq beg (ignore-errors (read (current-buffer))))
 	(goto-char (point-max))
@@ -504,17 +506,23 @@
 		       lines (or beg 0) (or end 0) group))))
 
 (deffoo nnshimbun-request-scan (&optional group server)
-  (setq group (nnshimbun-decode-group-name group))
+  (when (and group
+	     (progn
+	       (setq group (nnshimbun-decode-group-name group))
+	       (nnshimbun-possibly-change-group nil server)))
+    (nnshimbun-generate-nov-database group)))
+
+(deffoo nnshimbun-retrieve-groups (groups &optional server)
   (when (nnshimbun-possibly-change-group nil server)
-    (if group
-	(nnshimbun-generate-nov-database group)
-      (dolist (group (shimbun-groups nnshimbun-shimbun))
-	(nnshimbun-generate-nov-database group)))))
+    (dolist (group groups)
+      (nnshimbun-request-scan group server)
+      (nnshimbun-request-group group server))
+    (nnshimbun-request-list server)
+    'active))
 
 (deffoo nnshimbun-close-group (group &optional server)
   (setq group (nnshimbun-decode-group-name group))
-  (nnshimbun-write-nov group)
-  t)
+  (nnshimbun-write-nov group (nnshimbun-group-ephemeral-p group)))
 
 (deffoo nnshimbun-request-list (&optional server)
   (when (nnshimbun-possibly-change-group nil server)
@@ -558,7 +566,7 @@
   (unless (or gnus-nov-is-evil nnshimbun-nov-is-evil)
     (with-current-buffer nntp-server-buffer
       (erase-buffer)
-      (insert-buffer (nnshimbun-open-nov group))
+      (insert-buffer-substring (nnshimbun-open-nov group))
       (unless (and fetch-old (not (numberp fetch-old)))
 	(nnheader-nov-delete-outside-range
 	 (if fetch-old
@@ -597,7 +605,7 @@
 				(cdr strings))))
 	    nnshimbun-tmp-string))))
 
-(defsubst nnshimbun-insert-nov (number header &optional id)
+(defun nnshimbun-insert-nov (number header &optional id)
   (insert "\n")
   (backward-char 1)
   (let ((header-id (nnshimbun-string-or (shimbun-header-id header)))
@@ -646,12 +654,16 @@
       (goto-char (point-max))
       (forward-line -1)
       (let* ((i (or (ignore-errors (read (current-buffer))) 0))
-	     (name (concat "nnshimbun+" (nnshimbun-current-server) ":" group))
-	     (pre-fetch (nnshimbun-find-parameter name 'prefetch-articles t)))
+	     (name (unless (nnshimbun-group-ephemeral-p group)
+		     (nnshimbun-group-prefixed-name group)))
+	     (pre-fetch (when name
+			  (nnshimbun-find-parameter name 'prefetch-articles t))))
 	(dolist (header
 		 (shimbun-headers nnshimbun-shimbun
-				  (nnshimbun-find-parameter name
-							    'index-range t)))
+				  (if name
+				      (nnshimbun-find-parameter name
+								'index-range t)
+				    'last)))
 	  (let ((article
 		 (nnshimbun-search-id group (shimbun-header-id header))))
 	    (if article
@@ -673,12 +685,12 @@
 (defun nnshimbun-search-id (group id)
   (with-current-buffer (nnshimbun-open-nov group)
     (goto-char (point-min))
-    (let (found)
+    (let (found case-fold-search)
       (while (and (not found)
 		  (search-forward id nil t)) ; We find the ID.
 	;; And the id is in the fourth field.
 	(if (not (and (search-backward "\t" nil t 4)
-		      (not (search-backward "\t" (shimbun-point-at-bol) t))))
+		      (not (search-backward "\t" (point-at-bol) t))))
 	    (forward-line 1)
 	  (forward-line 0)
 	  (setq found t)))
@@ -687,7 +699,7 @@
 	(setq id (concat "X-Nnshimbun-Id: " id))
 	(while (and (not found)
 		    (search-forward id nil t))
-	  (if (not (search-backward "\t" (shimbun-point-at-bol) t 8))
+	  (if (not (search-backward "\t" (point-at-bol) t 8))
 	      (forward-line 1)
 	    (forward-line 0)
 	    (setq found t))))
@@ -697,7 +709,7 @@
 ;; This function is defined as the alternative of `nnheader-parse-nov'
 ;; in order to keep the compatibility between T-gnus and Gnus.
 (defun nnshimbun-parse-nov ()
-  (let ((eol (shimbun-point-at-eol)))
+  (let ((eol (point-at-eol)))
     (let ((number  (nnheader-nov-read-integer))
 	  (subject (nnheader-nov-field))
 	  (from    (nnheader-nov-field))
@@ -717,24 +729,13 @@
 			   (or (cdr (assq 'X-Nnshimbun-Id extra)) id)
 			   refs chars lines xref extra))))
 
-(defsubst nnshimbun-nov-buffer-name (&optional group)
-  (format " *nnshimbun overview %s %s*"
-	  (nnshimbun-current-server)
-	  (or group (nnshimbun-current-group))))
-
-(defsubst nnshimbun-nov-file-name (&optional group)
-  (nnmail-group-pathname (or group (nnshimbun-current-group))
-			 (nnshimbun-server-directory)
-			 nnshimbun-nov-file-name))
-
 (defun nnshimbun-open-nov (group)
   (let ((buffer (nnshimbun-nov-buffer-name group)))
     (unless (gnus-buffer-live-p buffer)
       (with-current-buffer (gnus-get-buffer-create buffer)
 	(erase-buffer)
 	(let ((file-name-coding-system nnmail-pathname-coding-system)
-	      (pathname-coding-system nnmail-pathname-coding-system)
-	      (nov (nnshimbun-nov-file-name group)))
+	      (nov (nnshimbun-group-pathname group nnshimbun-nov-file-name)))
 	  (when (file-exists-p nov)
 	    (nnheader-insert-file-contents nov)))
 	(set-buffer-modified-p nil)))
@@ -742,16 +743,23 @@
 
 (defun nnshimbun-write-nov (group &optional close)
   (let ((buffer (nnshimbun-nov-buffer-name group)))
-    (when (gnus-buffer-live-p buffer)
-      (with-current-buffer buffer
-	(let ((file-name-coding-system nnmail-pathname-coding-system)
-	      (pathname-coding-system nnmail-pathname-coding-system)
-	      (nov (nnshimbun-nov-file-name group)))
-	  (when (and (buffer-modified-p)
-		     (or (> (buffer-size) 0)
-			 (file-exists-p nov)))
-	    (nnmail-write-region 1 (point-max) nov nil 'nomesg)
-	    (set-buffer-modified-p nil))))
+    (prog1 (or (nnshimbun-group-ephemeral-p group)
+	       (not (gnus-buffer-live-p buffer))
+	       (let ((file-name-coding-system nnmail-pathname-coding-system))
+		 (when (let ((dir (nnshimbun-group-pathname group)))
+			 (or (file-directory-p dir)
+			     (ignore-errors
+			      (make-directory dir t)
+			      (file-directory-p dir))))
+		   (let ((nov (nnshimbun-group-pathname
+			       group nnshimbun-nov-file-name)))
+		     (with-current-buffer buffer
+		       (when (and (buffer-modified-p)
+				  (or (> (buffer-size) 0)
+				      (file-exists-p nov)))
+			 (nnmail-write-region 1 (point-max) nov nil 'nomesg)
+			 (set-buffer-modified-p nil)
+			 t))))))
       (when close
 	(kill-buffer buffer)))))
 
@@ -764,7 +772,7 @@
   (setq group (nnshimbun-decode-group-name group))
   (when (nnshimbun-possibly-change-group group server)
     (let* ((expirable (copy-sequence articles))
-	   (name (concat "nnshimbun+" (nnshimbun-current-server) ":" group))
+	   (name (nnshimbun-group-prefixed-name group))
 	   ;; If the group's `expiry-wait' parameter is non-nil, the value
 	   ;; of `nnmail-expiry-wait' will be bound to that value, and the
 	   ;; value of `nnmail-expiry-wait-function' will be bound to nil.
@@ -784,7 +792,7 @@
 	(while expirable
 	  (setq article (pop expirable))
 	  (when (and (nnheader-find-nov-line article)
-		     (setq end (shimbun-point-at-eol))
+		     (setq end (point-at-eol))
 		     (not (= (point-max) (1+ end))))
 	    (setq time (and (search-forward "\t" end t)
 			    (search-forward "\t" end t)
@@ -809,11 +817,11 @@
       articles)))
 
 (deffoo nnshimbun-request-delete-group (group &optional force server)
-  "Delete the NOV file used for GROUP and the parent directories.
+  "Delete NOV file used for GROUP and the parent directories.
 Other files in the directory are also deleted."
   (setq group (nnshimbun-decode-group-name group))
   (when (nnshimbun-possibly-change-group group server)
-    (let ((dir (nnmail-group-pathname group (nnshimbun-server-directory)))
+    (let ((dir (nnshimbun-group-pathname group))
 	  (nov (nnshimbun-nov-buffer-name group))
 	  files file subdir)
       (when (file-directory-p dir)
@@ -829,8 +837,9 @@
 	(unless subdir
 	  (delete-directory dir)))
       (setq dir (expand-file-name ".." dir))
-      (unless (directory-files
-	       dir t "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
+      (when (and (file-directory-p dir)
+		 (not (directory-files
+		       dir t "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
 	(delete-directory dir))
       (when (gnus-buffer-live-p nov)
 	(kill-buffer nov)))
@@ -861,7 +870,7 @@
 	    (while (and (not found)
 			(search-forward url nil t)
 			(looking-at "[?\t]"))
-	      (if (not (search-backward "\t" (shimbun-point-at-bol) t 7))
+	      (if (not (search-backward "\t" (point-at-bol) t 7))
 		  (forward-line 1)
 		(forward-line 0)
 		(setq found t))))
@@ -874,12 +883,13 @@
   (interactive "sURL: ")
   (let ((method (gnus-find-method-for-group gnus-newsgroup-name))
 	(header))
-    (and (eq 'nnshimbun (car method))
-	 (nnshimbun-possibly-change-group nil (nth 1 method))
-	 (setq header (nnshimbun-search-xref
-		       (gnus-group-short-name gnus-newsgroup-name) url))
-	 (with-current-buffer gnus-summary-buffer
-	   (gnus-summary-refer-article (shimbun-header-id header))))))
+    (or (and (eq 'nnshimbun (car method))
+	     (nnshimbun-possibly-change-group nil (nth 1 method))
+	     (setq header (nnshimbun-search-xref
+			   (gnus-group-short-name gnus-newsgroup-name) url))
+	     (with-current-buffer gnus-summary-buffer
+	       (gnus-summary-refer-article (shimbun-header-id header))))
+	'w3m-goto-url)))
 
 (defun nnshimbun-setup-article-mode ()
   (set (make-local-variable 'w3m-goto-article-function)
@@ -891,9 +901,11 @@
 (defvar nnshimbun-server-history nil)
 
 ;;;###autoload
-(defun gnus-group-make-shimbun-group (server group)
+(defun gnus-group-make-shimbun-group (server group &optional ephemeral)
   "Create a new nnshimbun group.
-The user will be prompted for a SERVER name and a GROUP name."
+The user will be prompted for a SERVER name and a GROUP name.  When
+this command is called with a prefix argument, it makes an ephemeral
+shimbun group."
   (interactive
    (let ((minibuffer-setup-hook
 	  (append minibuffer-setup-hook '(beginning-of-line)))
@@ -901,13 +913,13 @@
 	 server groups group)
      (unless (eq major-mode 'gnus-group-mode)
        (error "Command invoked outside of a Gnus group buffer"))
-     (setq server
-	   (let ((default-enable-multibyte-characters nil))
-	     (completing-read
-	      "Shimbun server address [Hit TAB to see candidates]: "
-	      alist nil t
-	      (car (delete "" nnshimbun-server-history))
-	      'nnshimbun-server-history)))
+     (setq server (completing-read
+		   "Shimbun server address [Hit TAB to see candidates]: "
+		   alist nil t
+		   (car (delete "" nnshimbun-server-history))
+		   'nnshimbun-server-history))
+     (static-unless (featurep 'xemacs)
+       (setq server (string-as-unibyte server)))
      (if (assoc server alist)
 	 (let ((shimbun (shimbun-open server)))
 	   (setq group (completing-read
@@ -920,19 +932,101 @@
 	   (unless (shimbun-group-p shimbun group)
 	     (setq group nil)))
        (setq server nil))
-     (list server group)))
+     (list server group current-prefix-arg)))
   (if (and server group)
-      (if (gnus-gethash (format "nnshimbun+%s:%s" server group)
-			gnus-newsrc-hashtb)
-	  (error "Group nnshimbun+%s:%s already exists" server group)
-	(let (nnshimbun-pre-fetch-article)
-	  (gnus-group-make-group
-	   (if (mm-coding-system-p 'utf-8)
-	       (mm-encode-coding-string group 'utf-8)
-	     group)
-	   (list 'nnshimbun server))))
+      (let (nname)
+	(setq server (list 'nnshimbun server)
+	      nname (gnus-group-prefixed-name
+		     (if (mm-coding-system-p 'utf-8)
+			 (mm-encode-coding-string group 'utf-8)
+		       group)
+		     server))
+	(if ephemeral
+	    (gnus-group-read-ephemeral-group nname server t
+					     (cons (current-buffer)
+						   (if (eq major-mode
+							   'gnus-summary-mode)
+						       'summary 'group)))
+	  (when (gnus-ephemeral-group-p nname)
+	    (gnus-kill-ephemeral-group nname))
+	  (let ((gnus-level-default-subscribed
+		 (or nnshimbun-default-group-level
+		     gnus-level-default-subscribed)))
+	    (gnus-group-make-group group server))))
     (error "Can't find group")))
 
+;;;###autoload
+(defun gnus-group-make-shimbun-groups (server)
+  "Create all nnshimbun groups prepared for SERVER."
+  (interactive
+   (let ((minibuffer-setup-hook (append minibuffer-setup-hook
+					'(beginning-of-line))))
+     (unless (eq major-mode 'gnus-group-mode)
+       (error "Command invoked outside of a Gnus group buffer"))
+     (list (completing-read
+	    "Shimbun server address [Hit TAB to see candidates]: "
+	    (shimbun-servers-alist) nil t))))
+  (unless (string-equal server "")
+    (let ((gnus-level-default-subscribed (or nnshimbun-default-group-level
+					     gnus-level-default-subscribed))
+	  (gnus-verbose 0)
+	  (grps (reverse (shimbun-groups (shimbun-open server))))
+	  (inhibit-read-only t)
+	  grp group)
+      (if grps
+	  (when (or (= (length grps) 1)
+		    (prog1 (yes-or-no-p (format "\
+Are you sure you want to make %d groups for nnshimbun+%s:? "
+						(length grps) server))
+		      (message "")))
+	    (while grps
+	      (setq grp (pop grps)
+		    group (format "nnshimbun+%s:%s" server grp))
+	      (if (gnus-group-entry group)
+		  (progn
+		    (save-excursion
+		      (unless (gnus-group-goto-group group)
+			(gnus-group-update-group group)
+			(gnus-group-goto-group group))
+		      (gnus-group-remove-mark group)
+		      (gnus-group-change-level
+		       group
+		       gnus-level-default-subscribed
+		       (or (gnus-group-group-level) gnus-level-killed))
+		      (gnus-group-update-group-line)
+		      (delete-region (point-at-bol)
+				     (progn (forward-line 1) (point))))
+		    (gnus-group-insert-group-line-info group)
+		    (forward-line -1))
+		(gnus-group-make-group grp (list 'nnshimbun server)))))
+	(message "No group is found in nnshimbun+%s:" server)))))
+
+(defun nnshimbun-generate-download-script (&optional async)
+  "Generate download script for all subscribed schimbuns.
+Output will be put in a new buffer.  If called with a prefix,
+puts a '&' after each w3m command."
+  (interactive "P")
+  (switch-to-buffer (get-buffer-create "*shimbun download script*"))
+  (erase-buffer)
+  (insert
+   (concat "#!/bin/sh\n# shimbun download script\n\n"
+	   "W3M=" (if w3m-command w3m-command "/usr/bin/w3m")
+	   "\nOPTS=\"-no-cookie -o accept_encoding=identity -dump_both\"\n\n"))
+  (let ((path (file-name-as-directory
+	       (expand-file-name shimbun-local-path)))
+	url fname)
+    ;; get all subscribed shimbun groups
+    (dolist (cur gnus-newsrc-alist)
+      (when (and (eq (car-safe (nth 4 cur)) 'nnshimbun)
+		 (<= (nth 1 cur) gnus-level-subscribed))
+	(when (string-match "nnshimbun\\+\\(.+\\):\\(.+\\)" (car cur))
+	  (nnshimbun-possibly-change-group (match-string 2 (car cur))
+					   (match-string 1 (car cur)))
+	  (when (setq url (shimbun-index-url nnshimbun-shimbun))
+	    (setq fname (concat path (substring (md5 url) 0 10) "_shimbun"))
+	    (insert
+	     (concat "$W3M $OPTS " (shell-quote-argument url) " > " fname
+		     (if async " &\n" "\n")))))))))
 
 (provide 'nnshimbun)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-2ch.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-2ch.el
--- work/emacs-w3m-1.4.4/shimbun/sb-2ch.el	2005-02-15 20:04:45.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-2ch.el	2005-07-06 08:52:29.000000000 +0900
@@ -17,8 +17,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-airs.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-airs.el
--- work/emacs-w3m-1.4.4/shimbun/sb-airs.el	2005-03-14 07:25:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-airs.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-airs.el --- shimbun backend for lists.airs.net
 
-;; Copyright (C) 2001, 2002, 2003, 2005 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001, 2002, 2003, 2005, 2007
+;; Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi  <teranisi@gohome.org>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -48,11 +49,11 @@
   "<STRONG><a name=\"\\([0-9]+\\)\" href=\"\\(msg[0-9]+.html\\)\">\\([^<]+\\)</a></STRONG> <EM>\\([^<]+\\)</EM>")
 
 (defmacro shimbun-airs-concat-url (shimbun url)
-  (` (concat (shimbun-url-internal (, shimbun))
-	     (nth 1 (assoc (shimbun-current-group-internal (, shimbun))
-			   shimbun-airs-group-path-alist))
-	     "/"
-	     (, url))))
+  `(concat (shimbun-url-internal ,shimbun)
+	   (nth 1 (assoc (shimbun-current-group-internal ,shimbun)
+			 shimbun-airs-group-path-alist))
+	   "/"
+	   ,url))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-airs))
   (shimbun-airs-concat-url shimbun "index.html"))
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-aljazeera.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-arch-bluegate.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-asahi-html.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi-html.el
--- work/emacs-w3m-1.4.4/shimbun/sb-asahi-html.el	2005-03-14 12:00:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi-html.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,32 +19,25 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 now semi-obsolete.  You can use sb-asahi.el to read
+;; html articles by putting the following line in your init file.
+;;
+;;(setq shimbun-asahi-prefer-text-plain nil)
+
 ;;; Code:
 
-(require 'shimbun)
 (require 'sb-asahi)
 
 (luna-define-class shimbun-asahi-html (shimbun-asahi) ())
 
-(defvar shimbun-asahi-html-content-start
-  "<!--[\t\n ]*Start of \\(Kiji\\|photo\\)[\t\n ]*-->\
-\\|<!--[\t\n ]*FJZONE START NAME=\"HONBUN\"[\t\n ]*-->")
-
-(defvar shimbun-asahi-html-content-end
-  "<!--[\t\n ]*End of Kiji[\t\n ]*-->\
-\\|<!--[\t\n ]*End of related link[\t\n ]*-->\
-\\|<!--[\t\n ]*FJZONE END NAME=\"HONBUN\"[\t\n ]*-->")
-
-(luna-define-method shimbun-make-contents ((shimbun shimbun-asahi-html)
-					   header)
-  (shimbun-asahi-prepare-article shimbun header)
-  (shimbun-make-html-contents shimbun header))
+(defconst shimbun-asahi-html-prefer-text-plain nil
+  "Non-nil means prefer text/plain articles rather than html articles.")
 
 (provide 'sb-asahi-html)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-asahi-mytown.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi-mytown.el
--- work/emacs-w3m-1.4.4/shimbun/sb-asahi-mytown.el	2004-08-03 15:37:47.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi-mytown.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-asahi-mytown.el --- mytown.asahi.com -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004 Katsumi Yamaoka
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Katsumi Yamaoka
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -32,56 +32,55 @@
 		   (shimbun-japanese-newspaper shimbun) ())
 
 (defvar shimbun-asahi-mytown-group-table
-  '(("hokkaido" "北海道")
-    ("aomori" "青森")
-    ("iwate" "岩手")
-    ("miyagi" "宮城")
-    ("akita" "秋田")
-    ("yamagata" "山形")
-    ("fukushima" "福島")
-    ("ibaraki" "茨城")
-    ("tochigi" "栃木")
-    ("gunma" "群馬")
-    ("saitama" "埼玉")
-    ("chiba" "千葉")
-    ("tokyo" "東京")
-    ("tama" "多摩")
-    ("kanagawa" "神奈川")
-    ("niigata" "新潟")
-    ("toyama" "富山")
-    ("ishikawa" "石川")
-    ("fukui" "福井")
-    ("yamanashi" "山梨")
-    ("nagano" "長野")
-    ("gifu" "岐阜")
-    ("shizuoka" "静岡")
-    ("aichi" "愛知")
-    ("mie" "三重")
-    ("shiga" "滋賀")
-    ("kyoto" "京都")
-    ("osaka" "大阪")
-    ("hyogo" "兵庫")
-    ("nara" "奈良")
-    ("wakayama" "和歌山")
-    ("tottori" "鳥取")
-    ("shimane" "島根")
-    ("okayama" "岡山")
-    ("hiroshima" "広島")
-    ("yamaguchi" "山口")
-    ("tokushima" "徳島")
-    ("kagawa" "香川")
-    ("ehime" "愛媛")
-    ("kochi" "高知")
-    ("fukuoka" "福岡・北九州")
-    ("saga" "佐賀")
-    ("nagasaki" "長崎")
-    ("kumamoto" "熊本")
-    ("oita" "大分")
-    ("miyazaki" "宮崎")
-    ("kagoshima" "鹿児島")
-    ("okinawa" "沖縄")
-    ("usa" "ＵＳＡ"))
-  "Alist of group names and their Japanese translations.")
+  '(("hokkaido" "北海道" "0100000")
+    ("aomori" "青森" "0200000")
+    ("iwate" "岩手" "0300000")
+    ("miyagi" "宮城" "0400000")
+    ("akita" "秋田" "0500000")
+    ("yamagata" "山形" "0600000")
+    ("fukushima" "福島" "0700000")
+    ("ibaraki" "茨城" "0800000")
+    ("tochigi" "栃木" "0900000")
+    ("gunma" "群馬" "1000000")
+    ("saitama" "埼玉" "1100000")
+    ("chiba" "千葉" "1200000")
+    ("tokyo" "東京" "1300000")
+    ("tama" "多摩" "1400000")
+    ("kanagawa" "神奈川" "1500000")
+    ("niigata" "新潟" "1600000")
+    ("toyama" "富山" "1700000")
+    ("ishikawa" "石川" "1800000")
+    ("fukui" "福井" "1900000")
+    ("yamanashi" "山梨" "2000000")
+    ("nagano" "長野" "2100000")
+    ("gifu" "岐阜" "2200000")
+    ("shizuoka" "静岡" "2300000")
+    ("aichi" "愛知" "2400000")
+    ("mie" "三重" "2500000")
+    ("shiga" "滋賀" "2600000")
+    ("kyoto" "京都" "2700000")
+    ("osaka" "大阪" "2800000")
+    ("hyogo" "兵庫" "2900000")
+    ("nara" "奈良" "3000000")
+    ("wakayama" "和歌山" "3100000")
+    ("tottori" "鳥取" "3200000")
+    ("shimane" "島根" "3300000")
+    ("okayama" "岡山" "3400000")
+    ("hiroshima" "広島" "3500000")
+    ("yamaguchi" "山口" "3600000")
+    ("tokushima" "徳島" "3700000")
+    ("kagawa" "香川" "3800000")
+    ("ehime" "愛媛" "3900000")
+    ("kochi" "高知" "4000000")
+    ("fukuoka" "福岡・北九州" "4100000")
+    ("saga" "佐賀" "4200000")
+    ("nagasaki" "長崎" "4300000")
+    ("kumamoto" "熊本" "4400000")
+    ("oita" "大分" "4500000")
+    ("miyazaki" "宮崎" "4600000")
+    ("kagoshima" "鹿児島" "4700000")
+    ("okinawa" "沖縄" "4800000"))
+  "Alist of group names, their Japanese translations and ids.")
 
 (defvar shimbun-asahi-mytown-server-name "朝日新聞")
 
@@ -92,16 +91,14 @@
   (concat "http://" shimbun-asahi-mytown-top-level-domain "/")
   "Name of the parent url.")
 
-(defvar shimbun-asahi-mytown-from-address
-  (concat "webmaster@" shimbun-asahi-mytown-top-level-domain))
-
 (defvar shimbun-asahi-mytown-expiration-days 6)
 
 (defvar shimbun-asahi-mytown-content-start
-  "<!--[\t\n ]*FJZONE START NAME=\"\\(HONBUN\\|MIDASHI\\)\"[\t\n ]*-->")
+  "<!--[\t\n ]*Start of photo[\t\n ]*-->\\|<!--★★写真ここから★★-->\
+\\|<!--[\t\n ]*Start of Kiji[\t\n ]*-->\\|<!--★★本文ここから★★-->")
 
 (defvar shimbun-asahi-mytown-content-end
-  "<!--[\t\n ]*FJZONE END NAME=\"HONBUN\"[\t\n ]*-->")
+  "<!--★★本文ここまで★★-->\\|<!--[\t\n ]*End of Kiji[\t\n ]*-->")
 
 (defvar shimbun-asahi-mytown-x-face-alist
   '(("default" . "X-Face: +Oh!C!EFfmR$+Zw{dwWW]1e_>S0rnNCA*CX|\
@@ -112,39 +109,57 @@
   (mapcar 'car shimbun-asahi-mytown-group-table))
 
 (luna-define-method shimbun-current-group-name ((shimbun shimbun-asahi-mytown))
-  (concat "マイタウン"
+  (concat "朝日マイタウン ("
 	  (nth 1 (assoc (shimbun-current-group-internal shimbun)
-			shimbun-asahi-mytown-group-table))))
+			shimbun-asahi-mytown-group-table))
+	  ")"))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-asahi-mytown))
-  (concat shimbun-asahi-mytown-url
-	  (shimbun-current-group-internal shimbun)
-	  "/news_itiran.asp"))
+  (let ((group (shimbun-current-group-internal shimbun)))
+    (concat shimbun-asahi-mytown-url
+	    group
+	    "/newslist.php?d_id="
+	    (nth 2 (assoc group shimbun-asahi-mytown-group-table)))))
 
 (defun shimbun-asahi-mytown-get-headers (shimbun)
   "Return a list of headers."
   (let ((group (shimbun-current-group-internal shimbun))
-	(from (shimbun-from-address shimbun))
+	(from (shimbun-current-group-name shimbun))
 	(case-fold-search t)
-	cyear cmonth start href artnum limit month day subject year headers)
-    (setq cyear (decode-time)
+	cyear cmonth url id subject month day year headers)
+    (setq cyear (shimbun-decode-time nil 32400)
 	  cmonth (nth 4 cyear)
 	  cyear (nth 5 cyear))
-    (while (and (re-search-forward "<[\t\n\r ]*a[\t\n\r ]+href=\"\
-\\(news\\.asp\\?kiji=\\([0-9]+\\)\\)\"" nil t)
-		(setq start (match-end 0)
-		      href (match-string 1)
-		      artnum (match-string 2))
-		(re-search-forward "<[\t\n\r ]*/a[\t\n\r ]*>[\t\n\r ]*（\
-\[\t\n\r ]*\\([0-9]+\\)[\t\n\r ]*/[\t\n\r ]*\\([0-9]+\\)" nil t)
-		(setq limit (match-beginning 0)
-		      month (string-to-number (match-string 1))
-		      day (string-to-number (match-string 2)))
-		(goto-char start)
-		(re-search-forward ">\\([\t\n\r ]*<[^<>]+>\\)*[\t\n\r ]*\
-\\([^<>]+\\)[\t\n\r ]*<?" limit t)
-		(setq subject (match-string 2)))
-      (setq year (cond ((>= (- month cmonth) 2)
+    (while (re-search-forward
+	    (eval-when-compile
+	      (let ((s0 "[\t\n 　]*")
+		    (s1 "[\t\n ]+")
+		    (no-nl "[^\n<>]+"))
+		(concat
+		 "<a" s1 "href=\""
+		 ;; 1. url
+		 "\\(news\\.php\\?k_id="
+		 ;; 2. id
+		 "\\([0-9]+\\)"
+		 "\\)"
+		 "\">" s0
+		 ;; 3. subject
+		 "\\(" no-nl "\\)"
+		 s0 "</a>" s0 "\\(?:<[^>]+>" s0 "\\)(" s0
+		 ;; 4. month
+		 "\\([01][0-9]\\)"
+		 s0 "/" s0
+		 ;; 5. day
+		 "\\([0-3][0-9]\\)"
+		 s0 ")")))
+	    nil t)
+      (setq url (shimbun-expand-url (concat group "/" (match-string 1))
+				    shimbun-asahi-mytown-url)
+	    id (match-string 2)
+	    subject (match-string 3)
+	    month (string-to-number (match-string 4))
+	    day (string-to-number (match-string 5))
+	    year (cond ((>= (- month cmonth) 2)
 			(1- cyear))
 		       ((and (= 1 month) (= 12 cmonth))
 			(1+ cyear))
@@ -161,13 +176,12 @@
 	     (shimbun-make-date-string year month day)
 	     ;; id
 	     (format "<%d%02d%02d.%s%%%s.%s>"
-		     year month day artnum group
+		     year month day id group
 		     shimbun-asahi-mytown-top-level-domain)
 	     ;; references, chars, lines
 	     "" 0 0
 	     ;; xref
-	     (shimbun-expand-url (concat group "/" href)
-				 shimbun-asahi-mytown-url))
+	     url)
 	    headers))
     headers))
 
@@ -176,18 +190,20 @@
   (shimbun-asahi-mytown-get-headers shimbun))
 
 (defun shimbun-asahi-mytown-prepare-article ()
-  "Remove a subject line."
+  "Remove trailing empty lines."
   (let ((case-fold-search t)
-	start)
-    (when (and (re-search-forward "\
-<!--[\t\n\r ]*FJZONE START NAME=\"MIDASHI\"[\t\n\r ]*-->"
-				  nil t)
-	       (setq start (point))
-	       (re-search-forward "\
-<!--[\t\n\r ]*FJZONE END NAME=\"MIDASHI\"[\t\n\r ]*-->[\t\n\r ]*\
-<hr[^>]*>[\t\n\r ]*"
-				  nil t))
-      (delete-region start (point)))))
+	end start)
+    (when (and (re-search-forward shimbun-asahi-mytown-content-start nil t)
+	       (re-search-forward shimbun-asahi-mytown-content-end nil t))
+      (setq end (goto-char (match-beginning 0))
+	    start end)
+      (while (and (re-search-backward "[\t\n\r ]*\\(?:<[^>]+>[\t\n\r ]*\\)"
+				      nil t)
+		  (if (= (match-end 0) start)
+		      (setq start (match-beginning 0))
+		    (delete-region (goto-char start) end)
+		    (insert "\n")
+		    nil))))))
 
 (luna-define-method shimbun-make-contents
   :before ((shimbun shimbun-asahi-mytown) header)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-asahi.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi.el
--- work/emacs-w3m-1.4.4/shimbun/sb-asahi.el	2005-03-17 12:59:58.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-asahi.el	2011-11-21 18:47:29.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; sb-asahi.el --- shimbun backend for asahi.com -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001-2011 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;         Yuuichi Teranishi  <teranisi@gohome.org>,
@@ -22,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -33,11 +32,16 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'shimbun)
-(require 'sb-text)
+(require 'sb-multi)
+
+(luna-define-class shimbun-asahi (shimbun-japanese-newspaper shimbun-multi
+							     shimbun) ())
 
-(luna-define-class shimbun-asahi
-		   (shimbun-japanese-newspaper shimbun-text) ())
+(defvar shimbun-asahi-prefer-text-plain t
+  "*Non-nil means prefer text/plain articles rather than html articles.")
 
 (defvar shimbun-asahi-top-level-domain "asahi.com"
   "Name of the top level domain for the Asahi shimbun.")
@@ -47,11 +51,11 @@
   "Name of the parent url.")
 
 (defun shimbun-asahi-make-regexp (name)
-  "Return a list of a regexp and numbers for the kansai.NAME group.
+  "Return a list of a regexp and numbers for the group NAME.
 Every `.' in NAME will be replaced with `/'."
   (list (let ((s0 "[\t\n 　]*")
 	      (s1 "[\t\n ]+")
-	      (no-nl "[^\n]+"))
+	      (no-nl "[^\n<>]+"))
 	  (concat "<a" s1 "href=\"/"
 		  ;; 1. url
 		  "\\(" (shimbun-subst-char-in-string ?. ?/ name) "/"
@@ -68,13 +72,13 @@
 		  "\">" s0
 		  ;; 6. subject
 		  "\\(" no-nl "\\)"
-		  s0 "</a>"))
+		  s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>"))
 	1 nil 2 6 3 4 5))
 
 (defvar shimbun-asahi-group-table
   (let* ((s0 "[\t\n 　]*")
 	 (s1 "[\t\n ]+")
-	 (no-nl "[^\n]+")
+	 (no-nl "[^\n<>]+")
 	 (default (list
 		   (concat
 		    "<a" s1 "href=\"/"
@@ -91,59 +95,131 @@
 		    "\">" s0
 		    ;; 5. subject
 		    "\\(" no-nl "\\)"
-		    s0 "</a>")
+		    s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>")
 		   1 4 nil 5 nil 2 3))
 	 (default2 (shimbun-asahi-make-regexp "%s"))
-	 (default3 (list
-		    (concat
-		     "<a" s1 "href=\"/+"
-		     ;; 1. url
-		     "\\(.+/"
-		     ;; 2. serial number
-		     "\\([a-z]*"
-		     ;; 3. year
-		     "\\(20[0-9][0-9]\\)"
-		     ;; 4. month
-		     "\\([01][0-9]\\)"
-		     ;; 5. day
-		     "\\([0-3][0-9]\\)"
-		     "[0-9]+\\)"
-		     "\\.html\\)"
-		     "\">" s0
-		     ;; 6. subject
-		     "\\(" no-nl "\\)"
-		     s0 "</a>")
-		    1 nil 2 6 3 4 5))
+	 (book (list
+		(concat
+		 "<a" s1 "href=\"/"
+		 ;; 1. url
+		 "\\(%s/"
+		 ;; 2. serial number
+		 "\\([a-z]*"
+		 ;; 3. year
+		 "\\(20[0-9][0-9]\\)"
+		 ;; 4. month
+		 "\\([01][0-9]\\)"
+		 ;; 5. day
+		 "\\([0-3][0-9]\\)"
+		 "[0-9]+\\)"
+		 "\\.html\\)"
+		 "\"" s0 ">" s0
+		 ;; 6. subject
+		 "\\(" no-nl "\\)"
+		 s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>" s0 "</dt>")
+		1 2 nil 6 3 4 5))
 	 (edu (shimbun-asahi-make-regexp "edu.news"))
-	 (health (shimbun-asahi-make-regexp "health.news")))
-    `(("book" "出版ニュース" "book/news/"
-       ,@(shimbun-asahi-make-regexp "book.news"))
+	 (international (list
+			 (concat
+			  "<a" s1 "href=\"/"
+			  ;; 1. url
+			  "\\(international/update/"
+			  ;; 2. month
+			  "\\([01][0-9]\\)"
+			  ;; 3. day
+			  "\\([0-3][0-9]\\)"
+			  "/"
+			  ;; 4. serial number
+			  "\\([a-z]*[0-9]+\\)"
+			  "\\.html\\)"
+			  "\">" s0
+			  ;; 5. subject
+			  "\\(" no-nl "\\)"
+			  s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>")
+			 1 4 nil 5 nil 2 3))
+	 (rss (list
+	       (concat
+		"<item" s1 "rdf:about=\""
+		;; 1. url
+		"\\(http://\\(?:book\\|www\\)\\.asahi\\.com//?"
+		;; 2. extra keyword (en)
+		"\\([^/]+\\)"
+		"\\(?:/update/"
+		;; 3 and 4. serial number
+		"\\([0-9]+\\)\\)?/\\([a-z]*[0-9]+\\)"
+		"\\.html\\?ref=rss\\)"
+		"\"" s0 ">" s0 "<title>" s0
+		;; 5. subject
+		"\\([^<]+\\)"
+		s0 "</title>\\(?:"
+		s0 "\\(?:<[^>]+/>"
+		"\\|<[^>]+>\\(?:<[^]]+\\]+>\\|[^<]+\\)</[^>]+>\\)\\)*"
+		s0 "<dc:subject>" s0
+		;; 6. extra keyword (ja)
+		"\\([^<]+\\)"
+		s0 "</dc:subject>" s0 "<dc:date>" s0
+		;; 7. year
+		"\\(20[0-9][0-9]\\)"
+		"-"
+		;; 8. month
+		"\\([01][0-9]\\)"
+		"-"
+		;; 9. day
+		"\\([0-3][0-9]\\)"
+		"T"
+		;; 10. hour:min:sec
+		"\\([012][0-9]:[0-5][0-9]:[0-5][0-9]\\)")
+	       1 3 4 5 7 8 9 10 2 nil 6)))
+    `(("book" "RSS" "http://www3.asahi.com/rss/book.rdf" ,@rss)
+      ("book.column" "コラム")
+      ("book.news" "出版ニュース" nil ,@book)
+      ("book.paperback" "文庫・新書")
+      ("book.review" "書評" nil ,@book)
+      ("book.special" "特集" nil
+       ,(concat
+	 "<a" s1 "href=\"\\(?:http://book\\.asahi\\.com\\)?/"
+	 ;; 1. url
+	 "\\([^/]+/"
+	 ;; 2. serial number
+	 "\\([a-z]*"
+	 ;; 3. year
+	 "\\(20[0-9][0-9]\\)"
+	 ;; 4. month
+	 "\\([01][0-9]\\)"
+	 ;; 5. day
+	 "\\([0-3][0-9]\\)"
+	 "[0-9]+\\)"
+	 "\\.html\\)"
+	 "\"" s0 ">" s0
+	 ;; 6. subject
+	 "\\(" no-nl "\\)")
+       1 2 nil 6 3 4 5)
       ("business" "ビジネス" "%s/list.html" ,@default)
-      ;; The url should be ended with "index.html".
-      ("business.column" "経済気象台" "business/column/index.html" ,@default2)
       ("car" "愛車" "%s/news/" ,@(shimbun-asahi-make-regexp "car.news"))
-      ("car.italycolumn" "イタリア発アモーレ！モトーレ！" "car/italycolumn/"
-       ,@default2)
-      ("car.motorsports" "モータースポーツ" "car/motorsports/" ,@default2)
-      ("car.newcar" "新車情報" "car/newcar/" ,@default2)
-      ("car.newcarbywebcg" "新車発表会" "car/newcarbywebcg/" ,@default2)
-      ("culture" "文化・芸能" "%s/list.html" ,@default)
-      ("culture.column" "もやしのひげ" "culture/list_moyashi.html"
-       ,@(shimbun-asahi-make-regexp "culture.column.moyashi"))
-      ("digital" "デジタル機器" "digital/av/"
-       ,@(shimbun-asahi-make-regexp "digital.av"))
-      ("digital.apc" "雑誌「ASAHIパソコン」ニュース" "digital/apc/" ,@default2)
-      ("digital.bcnnews" "eビジネス情報 (提供：ＢＣＮ)" "digital/bcnnews/"
-       ,@default2)
-      ("digital.column01" "デジタルコラム" "digital/column01/"
-       ,@default2)
-      ("digital.hotwired" "HotWired Japan" "digital/hotwired/" ,@default2)
-      ("digital.internet" "ネット・ウイルス" "digital/internet/" ,@default2)
-      ("digital.mobile" "携帯電話" "digital/mobile/" ,@default2)
-      ("digital.nikkanko" "日刊工業新聞ニュース" "digital/nikkanko/"
-       ,@default2)
-      ("digital.pc" "パソコン" "digital/pc/" ,@default2)
-      ("editorial" "社説" "paper/editorial.html"
+      ("culture" "文化・芸能" "%s/list.html"
+       ,(concat "<a" s1 "href=\"/"
+		;; 1. url
+		"\\(culture/"
+		"\\(?:[^/]+/\\)?"
+		;; 2. serial number
+		"\\([a-z]*"
+		;; 3. year
+		"\\(20[0-9][0-9]\\)"
+		;; 4. month
+		"\\([01][0-9]\\)"
+		;; 5. day
+		"\\([0-3][0-9]\\)"
+		"[0-9]+\\)"
+		"\\.html\\)"
+		"\">" s0
+		;; 6. subject
+		"\\([^<]+\\)"
+		s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>" s0
+		"<\\(?:/dt\\|span\\)")
+       1 nil 2 6 3 4 5)
+      ("digital" "デジタル" "%s/list.html"
+       ,@(shimbun-asahi-make-regexp "digital/[^\"/]+"))
+      ("editorial" "社説" "include/editorial_bno4.xml"
        ,(concat
 	 "<a" s1 "href=\"\\./"
 	 ;; 1. url
@@ -157,162 +233,53 @@
 	 "\\.html\\)"
 	 "\"")
        1 nil nil nil 2 3 4)
-      ("edu" "教育" "%s/news/index.html" ,@edu)
-      ("edu.column" "教育コラム" "edu/column/ikuji/"
-       ,@(shimbun-asahi-make-regexp "edu.column.ikuji"))
-      ("edu.it" "IT教育" "edu/news/it.html" ,@edu)
-      ("edu.kosodate" "子育て" "edu/news/kosodate.html" ,@edu)
-      ("edu.nyushi" "大学・入試" "edu/news/nyushi.html" ,@edu)
-      ("edu.tamate" "ののちゃんのふしぎ玉手箱" "edu/nie/tamate/"
-       ,@(shimbun-asahi-make-regexp "edu.nie.tamate.kiji"))
+      ("edu" "教育" "%s/list.html" ,@edu)
       ("english" "ENGLISH" "%s/index.html"
        ,@(let ((rest (shimbun-asahi-make-regexp "english.Herald-asahi")))
-	   (cons (concat (car rest)
-			 "\\(" s0 "<[^>]+>\\)*" s0 "([01]?[0-9]/[0-3]?[0-9])")
+	   (cons (concat
+		  (car rest)
+		  "\\(?:" s0 "<[^>]+>\\)*" s0 "([01]?[0-9]/[0-3]?[0-9])")
 		 (cdr rest))))
-      ("health" "健康・生活" "%s/news/" ,@health)
-      ("health.aged" "福祉・高齢" "health/news/aged.html" ,@health)
-      ("health.alz" "認知症特集" "health/news/alz.html" ,@health)
-      ("health.medical" "医療・病気" "health/news/medical.html" ,@health)
+      ("food" "食" "%s/news/" ,@(shimbun-asahi-make-regexp "food.news"))
+      ("health" "健康" "%s/list.html"
+       ,@(shimbun-asahi-make-regexp "health.news"))
       ("housing" "住まい" "%s/news/"
        ,@(shimbun-asahi-make-regexp "housing.news"))
-      ("housing.amano" "天野彰のいい家いい家族" "housing/amano/" ,@default2)
-      ("housing.column" "住まいのお役立ちコラム" "housing/column/" ,@default2)
-      ("housing.diary" "小さな家の生活日記" "housing/diary/" ,@default2)
-      ("housing.world" "世界のウチ" "housing/world/" ,@default2)
       ("igo" "囲碁" "%s/news/" ,@(shimbun-asahi-make-regexp "igo.news"))
       ("international" "国際" "%s/list.html" ,@default)
-      ("international.jinmin" "人民日報" "international/jinmin/index.html"
-       ,@default2)
+      ("international.asia" "アジア" "international/asia.html" ,@international)
+      ("international.column" "コラム")
+      ("international.special" "特集")
+      ("international.world" "世界")
       ("job" "就職・転職" "%s/news/"
        ,@(shimbun-asahi-make-regexp "job.news"))
-      ("job.special" "週刊朝日・ＡＥＲＡから" "job/special/"
-       ,(concat
-	 (car default2)
-	 "\\(" s0 "<[^>]+>\\)*" s0 "（" s0
-	 ;; 8. extra
-	 "\\(" no-nl "\\)"
-	 "：")
-       ,@(cdr default2) nil 8)
       ("kansai" "関西" "%s/news/" ,@(shimbun-asahi-make-regexp "kansai.news"))
-      ("kansai.horiekenichi" "堀江謙一の世界一周ひとりぼっち"
-       "kansai/horiekenichi/" ,@default2)
-      ("kansai.umaimon" "うまいもん" "kansai/umaimon/" ,@default2)
-      ("kansai.fuukei" "風景を歩く" "kansai/fuukei/" ,@default2)
-      ("kansai.yotsuba" "よつ葉びより" "kansai/yotsuba/" ,@default2)
-      ("kansai.smile" "スマイルスタイル" "kansai/smile/" ,@default2)
-      ("kansai.keiki" "け〜きの“ええ話”" "kansai/keiki/" ,@default2)
-      ("kansai.okiniiri" "DJのお気に入り" "kansai/okiniiri/" ,@default2)
-      ("kansai.syun" "旬の顔" "kansai/syun/" ,@default2)
-      ("kansai.takara" "たから図鑑" "kansai/takara/" ,@default2)
-      ("kansai.kansaiisan" "勝手に関西世界遺産" "kansai/kansaiisan/"
-       ,@default2)
-      ("kansai.depa" "デパ地下ＮＥＷＳ" "kansai/depa/" ,@default2)
-      ("kansai.kaban" "かばんの中身" "kansai/kaban/" ,@default2)
-      ("kansai.kyosho" "巨匠に学べ" "kansai/kyosho/" ,@default2)
-      ("kansai.okan" "母さんの知恵袋" "kansai/okan/" ,@default2)
-      ("kansai.densetsu" "ほんま？関西伝説" "kansai/densetsu/" ,@default2)
-      ("kansai.onayami" "みうらじゅんのお悩み祭り" "kansai/onayami/"
-       ,@default2)
-      ("kansai.sanshi" "三枝の笑ウインドウ" "kansai/sanshi/" ,@default2)
+      ("kansai.entertainment" "楽しむ")
+      ("kansai.kokoro" "こころ")
+      ("kansai.sumai" "住まい")
+      ("kansai.taberu" "食べる")
+      ("komimi" "コミミ口コミ" "%s/list.html" ,@default2)
       ("life" "暮らし" "%s/list.html" ,@default)
-      ("life.column" "暮らしコラム" "life/column/"
-       ,(concat
-	 "<a" s1 "href=\"/"
-	 ;; 1. url
-	 "\\(life/column/"
-	 ;; 2. serial number
-	 "\\(.+/[a-z]*"
-	 ;; 3. year
-	 "\\(20[0-9][0-9]\\)"
-	 ;; 4. month
-	 "\\([01][0-9]\\)"
-	 ;; 5. day
-	 "\\([0-3][0-9]\\)"
-	 "[0-9]*\\)"
-	 "\\.html\\)"
-	 "\">" s0
-	 ;; 6. subject
-	 "\\(" no-nl "\\)"
-	 s0 "</a>")
-       1 nil 2 6 3 4 5)
-      ("life.food" "食と料理" "life/food/"
-       ,(concat
-	 "<a" s1 "href=\"/"
-	 ;; 1. url
-	 "\\(life/food/"
-	 ;; 2. serial number
-	 "\\(.+/[a-z]*"
-	 ;; 3. year
-	 "\\(20[0-9][0-9]\\)"
-	 ;; 4. month
-	 "\\([01][0-9]\\)"
-	 ;; 5. day
-	 "\\([0-3][0-9]\\)"
-	 "[0-9]+\\)"
-	 "\\.html\\)"
-	 "\">" s0
-	 ;; 6. subject
-	 "\\(" no-nl "\\)"
-	 s0 "</a>")
-       1 nil 2 6 3 4 5)
-      ("nankyoku" "南極プロジェクト" "%s/news/"
-       ,@(shimbun-asahi-make-regexp "nankyoku.news"))
-      ("nankyoku.borderless" "国境のない大陸から" "nankyoku/borderless/"
-       ,@default2)
-      ("nankyoku.people" "越冬隊の人びと" "nankyoku/people/" ,@default2)
-      ("nankyoku.whitemail" "WhiteMail＠南極" "nankyoku/whitemail/" ,@default2)
+      ("life.column" "コラム")
       ("national" "社会" "%s/list.html" ,@default)
-      ("national.calamity" "災害・交通情報" "national/calamity.html"
-       ,@default3)
-      ("national.etc" "その他・話題" "national/etc.html" ,@default3)
-      ("national.trial" "裁判" "national/trial.html" ,@default3)
-      ("obituaries" "おくやみ" "obituaries" ,@default)
       ("politics" "政治" "%s/list.html" ,@default)
-      ("rss" "RSS" "http://www3.asahi.com/rss/index.rdf"
-       ,(concat
-	 "<title>"
-	 ;; 1. subject
-	 "\\([^<]+\\)"
-	 "</title>\n<link>"
-	 ;; 2. url
-	 "\\(http://www\\.asahi\\.com/"
-	 ;; 3. extra keyword (en)
-	 "\\([^/]+\\)"
-	 "/update/"
-	 ;; 4 and 5. serial number
-	 "\\([0-9]+\\)/\\([0-9]+\\)"
-	 "\\.html\\?ref=rss\\)"
-	 "</link>\n<description/>\n<dc:subject>"
-	 ;; 6. extra keyword (ja)
-	 "\\([^<]+\\)"
-	 "</dc:subject>\n<dc:date>20[0-9][0-9]-"
-	 ;; 7. month
-	 "\\([01][0-9]\\)"
-	 "-"
-	 ;; 8. day.
-	 "\\([0-3][0-9]\\)"
-	 "T"
-	 ;; 9. hour:min:sec
-	 "\\([012][0-9]:[0-5][0-9]:[0-5][0-9]\\)")
-       2 4 5 1 nil 7 8 9 3 nil 6)
-      ("science" "サイエンス" "%s/list.html"
-       ,@(shimbun-asahi-make-regexp "science.news"))
+      ("rss" "RSS" "http://www3.asahi.com/rss/index.rdf" ,@rss)
+      ("science" "サイエンス" "%s/list.html" ,@default)
       ("shopping" "ショッピング" "%s/news/"
        ,@(shimbun-asahi-make-regexp "shopping.news"))
-      ("shopping.kishi" "岸朝子の気になるお取り寄せ12カ月" "shopping/kishi/"
-       ,@default2)
-      ("shopping.ryouhin" "くらしの良品探訪" "shopping/ryouhin/"
-       ,@default2)
-      ("shougi" "将棋" "%s/news/" ,@(shimbun-asahi-make-regexp "shougi.news"))
+      ("shopping.column" "コラム")
+      ("shopping.yakimono" "やきもの")
+      ("shougi" "将棋")
       ("sports" "スポーツ" "%s/list.html" ,@default)
-      ("sports.baseball" "野球" "sports/bb/"
-       ,@(shimbun-asahi-make-regexp "sports.bb"))
-      ("sports.column" "スポーツコラム" "sports/column/" ,@default2)
-      ("sports.football" "サッカー" "sports/fb/"
-       ,@(shimbun-asahi-make-regexp "sports.fb"))
-      ("sports.spo" "一般スポーツ" "sports/spo/" ,@default2)
-      ("tenjin" "天声人語" "paper/column.html"
+      ("sports.baseball" "野球")
+      ("sports.battle" "格闘技・相撲")
+      ("sports.etc" "その他")
+      ("sports.football" "サッカー")
+      ("sports.golf" "ゴルフ")
+      ("sports.rugby" "ラグビー")
+      ("sports.usa" "米プロスポーツ")
+      ("sports.winter" "ウインタースポーツ")
+      ("tenjin" "天声人語" "include/column_bno4.xml"
        ,(concat
 	 "<a" s1 "href=\"\\./"
 	 ;; 1. url
@@ -328,32 +295,689 @@
        1 nil nil nil 2 3 4)
       ("travel" "トラベル" "%s/news/"
        ,@(shimbun-asahi-make-regexp "travel.news"))
-      ("travel.kaido" "司馬遼太郎・街道をゆく" "travel/kaido/" ,@default2)
-      ("travel.matsuri" "日本の祭り" "travel/matsuri/"
-       ,@default2)
-      ("travel.zeitaku" "地球の贅たく" "travel/zeitaku/"
-       ,@default2)
-      ("wakamiya" "風考計 (論説主幹・若宮啓文)" "column/wakamiya/"
-       ,@(shimbun-asahi-make-regexp "column.wakayama"))))
+      ("wakata" "若田さんきぼう滞在記" "%s/"
+       ,(concat
+	 "<a" s1 "href=\"/"
+	 ;; 1. url
+	 "\\(wakata\\(?:/[^\"/]+\\)*/"
+	 ;; 2. serial number
+	 "\\([a-z]*"
+	 ;; 3. year
+	 "\\(20[0-9][0-9]\\)"
+	 ;; 4. month
+	 "\\([01][0-9]\\)"
+	 ;; 5. day
+	 "\\([0-3][0-9]\\)"
+	 "[0-9]+\\)"
+	 "\\.html\\)"
+	 "\">" s0
+	 ;; 6. subject
+	 "\\([^\n<>]+\\)"
+	 s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)*</a>")
+       1 nil 2 6 3 4 5)))
   "Alist of group names, their Japanese translations, index pages,
 regexps and numbers.  Where index pages and regexps may contain the
 \"%s\" token which is replaced with group names, numbers point to the
 search result in order of [0]a url, [1,2]a serial number, [3]a subject,
-\[4]a year, [5]a month, [6]a day, [7]an hour:minute and [8,9,10]an
-extra keyword.")
+\[4]a year, [5]a month, [6]a day, [7]an hour:minute, [8,9,10]an extra
+keyword, [11]hour and [12]minute.  If an index page is nil, a group
+name in which \".\" is substituted with \"/\" is used instead.")
+
+(defvar shimbun-asahi-subgroups-alist
+  (let* ((s0 "[\t\n 　]*")
+	 (s1 "[\t\n ]+")
+	 (no-nl "[^\n<>]+")
+	 (default (list
+		   (concat
+		    "<a" s1 "href=\"/"
+		    ;; 1. url
+		    "\\(%s/update/"
+		    ;; 2. month
+		    "\\([01][0-9]\\)"
+		    ;; 3. day
+		    "\\([0-3][0-9]\\)"
+		    "/"
+		    ;; 4. serial number
+		    "\\([a-z]*[0-9]+\\)"
+		    "\\.html\\)"
+		    "\">" s0
+		    ;; 5. subject
+		    "\\(" no-nl "\\)"
+		    s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>")
+		   1 4 nil 5 nil 2 3))
+	 (baseball (shimbun-asahi-make-regexp "sports.bb"))
+	 (book1 (list
+		 (concat
+		  "<a" s1 "href=\"/"
+		  ;; 1. url
+		  "\\(%s/"
+		  ;; 2. serial number
+		  "\\([a-z]*"
+		  ;; 3. year
+		  "\\(20[0-9][0-9]\\)"
+		  ;; 4. month
+		  "\\([01][0-9]\\)"
+		  ;; 5. day
+		  "\\([0-3][0-9]\\)"
+		  "[0-9]+\\)"
+		  "\\.html\\)"
+		  "\"" s0 ">" s0
+		  ;; 6. subject
+		  "\\(" no-nl "\\)"
+		  s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>" s0 "</dt>")
+		 1 2 nil 6 3 4 5))
+	 (book2 (list
+		 (concat
+		  "<a" s1 "href=\"http://book\\.asahi\\.com/"
+		  ;; 1. url
+		  "\\([^/]+/"
+		  ;; 2. serial number
+		  "\\([a-z]*"
+		  ;; 3. year
+		  "\\(20[0-9][0-9]\\)"
+		  ;; 4. month
+		  "\\([01][0-9]\\)"
+		  ;; 5. day
+		  "\\([0-3][0-9]\\)"
+		  "[0-9]+\\)"
+		  "\\.html\\)"
+		  "\"" s0 ">" s0
+		  ;; 6. subject
+		  "\\(" no-nl "\\)"
+		  s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>" s0 "</dt>")
+		 1 2 nil 6 3 4 5))
+	 (business (list
+		    (concat
+		     "<a" s1 "href=\""
+		     ;; 1. url
+		     "\\(/business/%s/\\(?:[^/]+/\\)?"
+		     ;; 2. serial number
+		     "\\([a-z]+"
+		     ;; 3. year
+		     "\\(20[0-9][0-9]\\)"
+		     ;; 4. month
+		     "\\([01][0-9]\\)"
+		     ;; 5. day
+		     "\\([0-3][0-9]\\)"
+		     "\\(?:[0-9]+\\)"
+		     "\\.html\\)\\)"
+		     "\"" s0 ">" s0
+		     ;; 6. subject
+		     "\\(" no-nl "\\)"
+		     "</a><span class=\"")
+		    1 2 nil 6 3 4 5))
+	 (culture (list
+		   (concat
+		    "<a" s1 "href=\"/"
+		    ;; 1. url
+		    "\\(culture\\(?:/[^\"/]+\\)+/"
+		    ;; 2. serial number
+		    "\\([a-z]*"
+		    ;; 3. year
+		    "\\(20[0-9][0-9]\\)"
+		    ;; 4. month
+		    "\\([01][0-9]\\)"
+		    ;; 5. day
+		    "\\([0-3][0-9]\\)"
+		    "[0-9]+\\)"
+		    "\\.html\\)"
+		    "\">" s0
+		    ;; 6. subject
+		    "\\(" no-nl "\\)"
+		    s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>"
+		    "[\t\n ]*\\(?:</dt>\\|<span[\t\n ]+\\)")
+		   1 nil 2 6 3 4 5))
+	 (edu (nthcdr 3 (assoc "edu" shimbun-asahi-group-table)))
+	 (football (shimbun-asahi-make-regexp "sports.fb"))
+	 (health (nthcdr 3 (assoc "health" shimbun-asahi-group-table)))
+	 (international (nthcdr 3 (assoc "international.asia"
+					 shimbun-asahi-group-table)))
+	 (national (cons (format (car default) "national") (cdr default)))
+	 (paperback (list
+		     (concat
+		      "<a" s1 "href=\"/"
+		      ;; 1. url
+		      "\\(paperback/"
+		      ;; 2. serial number
+		      "\\([a-z]*"
+		      ;; 3. year
+		      "\\(20[0-9][0-9]\\)"
+		      ;; 4. month
+		      "\\([01][0-9]\\)"
+		      ;; 5. day
+		      "\\([0-3][0-9]\\)"
+		      "[0-9]+\\)"
+		      "\\.html\\)"
+		      "\"" s0 ">" s0
+		      ;; 6. subject
+		      "\\(" no-nl "\\)"
+		      s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>" s0 "</dt>")
+		     1 2 nil 6 3 4 5))
+	 (politics (cons (format (car default) "politics") (cdr default)))
+	 (shopping (list
+		    (concat
+		     "<a" s1 "href=\"/"
+		     ;; 1. url
+		     "\\(shopping/\\(?:[^\"./>]+/\\)+"
+		     ;; 2. serial number
+		     "\\([a-z]*"
+		     ;; 3. year
+		     "\\(20[0-9][0-9]\\)"
+		     ;; 4. month
+		     "\\([01][0-9]\\)"
+		     ;; 5. day
+		     "\\([0-3][0-9]\\)"
+		     "[0-9]*\\)"
+		     "\\.html\\)"
+		     "\">" s0
+		     ;; 6. subject
+		     "\\([^<]+\\)"
+		     "\\(?:" s0 "<[^>]+>\\)*" s0 "([01]?[0-9]/[0-3]?[0-9])")
+		    1 nil 2 6 3 4 5))
+	 (shopping2 (list
+		     (concat
+		      "<a" s1 "href=\"/"
+		      ;; 1. url
+		      "\\(shopping/yakimono/\\(?:ono\\|yellin\\)/"
+		      ;; 2. serial number
+		      "\\([a-z]*"
+		      ;; 3. year
+		      "\\(20[0-9][0-9]\\)"
+		      ;; 4. month
+		      "\\([01][0-9]\\)"
+		      ;; 5. day
+		      "\\([0-3][0-9]\\)"
+		      "[0-9]*\\)"
+		      "\\.html\\)"
+		      "\">\\(?:" s0
+		      "<div" s1 "class=\"keyword\">[^<]+</div>\\)?" s0
+		      ;; 6. subject
+		      "\\(" no-nl "\\)"
+		      "\\(?:" s0 "&#[0-9]+;\\|&#[0-9]+;" s0 "\\)*"
+		      "\\(?:" s0 "<[^>]+>\\)*" s0 "([01]?[0-9]/[0-3]?[0-9])")
+		     1 nil 2 6 3 4 5))
+	 (sports (shimbun-asahi-make-regexp "sports.spo"))
+	 (travel (list
+		  (concat "<a" s1 "href=\"/"
+			  ;; 1. url
+			  "\\(%s/"
+			  ;; 2. serial number
+			  "\\([a-z]*"
+			  ;; 3. year
+			  "\\(20[0-9][0-9]\\)"
+			  ;; 4. month
+			  "\\([01][0-9]\\)"
+			  ;; 5. day
+			  "\\([0-3][0-9]\\)"
+			  "[0-9]+\\)"
+			  "\\.html\\)"
+			  "\">" s0
+			  ;; 6. subject
+			  "\\([^<]+\\)"
+			  s0 "\\(?:<img" s1 "[^>]+>" s0 "\\)?</a>")
+		  1 nil 2 6 3 4 5)))
+    `(("book.column"
+       ("著者に会いたい" "http://book.asahi.com/author/"
+	,(format (car book1) "author") ,@(cdr book1))
+       ("売れてる本" "http://book.asahi.com/bestseller/"
+	,(format (car book1) "bestseller") ,@(cdr book1))
+       ("愛でたい文庫" "http://book.asahi.com/bunko/"
+	,(format (car book1) "bunko") ,@(cdr book1))
+       ("ビジネス書" "http://book.asahi.com/business/"
+	,(format (car book1) "business") ,@(cdr book1))
+       ("コミックガイド" "http://book.asahi.com/comic/"
+	,(format (car book1) "comic") ,@(cdr book1))
+       ("話題の本棚" "http://book.asahi.com/hondana/"
+	,(format (car book1) "hondana") ,@(cdr book1))
+       ("暮らしのお役立ち" "http://book.asahi.com/life/"
+	,(format (car book1) "life") ,@(cdr book1))
+       ("たいせつな本" "http://book.asahi.com/mybook/"
+	,(format (car book1) "mybook") ,@(cdr book1))
+       ("ニュースな新刊" "http://book.asahi.com/newstar/"
+	,(format (car book1) "newstar") ,@(cdr book1))
+       ("新書の穴" "http://book.asahi.com/shinsho/"
+	,(format (car book1) "shinsho") ,@(cdr book1))
+       ("ニュースな本" "http://book.asahi.com/topics/"
+	,(format (car book1) "topics") ,@(cdr book1))
+       ("デジタル読書" "http://book.asahi.com/trendwatch/"
+	,(format (car book1) "trendwatch") ,@(cdr book1)))
+      ("book.news"
+       ("朝日新聞社の新刊" "http://book.asahi.com/asahi/"
+	,(format (car book1) "asahi") ,@(cdr book1))
+       ("ひと・流行・話題" "http://book.asahi.com/clip/"
+	,(format (car book1) "clip") ,@(cdr book1))
+       ("オンラインブックフェア" "http://book.asahi.com/fair/"
+	,(format (car book1) "fair") ,@(cdr book1)))
+      ("book.paperback"
+       ("文庫" "http://book.asahi.com/paperback/bunko.html" ,@paperback)
+       ("新書" "http://book.asahi.com/paperback/shinsho.html" ,@paperback))
+      ("book.review"
+       ("ビジネス" "http://book.asahi.com/review/business.html" ,@book2)
+       ("デジタル" "http://book.asahi.com/review/digital.html" ,@book2)
+       ("教育 (児童書)" "http://book.asahi.com/review/edu.html" ,@book2)
+       ("国際" "http://book.asahi.com/review/international.html" ,@book2)
+       ("暮らし" "http://book.asahi.com/review/life.html" ,@book2))
+      ("book.special"
+       ("BOOK TIMES" "http://book.asahi.com/booktimes/"
+	,(format (car book1) "booktimes") ,@(cdr book1))
+       ("売れ筋ランキング" "http://book.asahi.com/ranking/"
+	,(format (car book1) "ranking") ,@(cdr book1)))
+      ("business"
+       ("ＡＥＲＡ発マネー" "http://www.asahi.com/business/aera/"
+	,(format (car business) "aera") ,@(cdr business))
+       ("投資信託" "http://www.asahi.com/business/fund/"
+	,(format (car business) "fund") ,@(cdr business))
+       ("商品ファイル" "http://www.asahi.com/business/products/"
+	,(format (car business) "products") ,@(cdr business))
+       ("ロイターニュース" "http://www.asahi.com/business/list_reuters.html"
+	,(format (car business) "reuters") ,@(cdr business))
+       ("今日の視点" "http://www.asahi.com/business/today_eye/"
+	,(format (car business) "today_eye") ,@(cdr business))
+       ("今日の市況" "http://www.asahi.com/business/today_shikyo/"
+	,(format (car business) "today_shikyo") ,@(cdr business))
+       ("経済を読む" "http://www.asahi.com/business/topics/"
+	,(format (car business) "topics") ,@(cdr business))
+       ("東洋経済ニュース" "http://www.asahi.com/business/list_toyo.html"
+	,(format (car business) "toyo") ,@(cdr business)))
+      ("car"
+       ("新車発表会" "http://www.asahi.com/car/cg/"
+	,@(shimbun-asahi-make-regexp "car.cg"))
+       ("イタリア発アモーレ！モトーレ！"
+	"http://www.asahi.com/car/italycolumn/"
+	,@(shimbun-asahi-make-regexp "car.italycolumn"))
+       ("モータースポーツ" "http://www.asahi.com/car/motorsports/"
+	,@(shimbun-asahi-make-regexp "car.motorsports"))
+       ("新車情報" "http://www.asahi.com/car/newcar/"
+	,@(shimbun-asahi-make-regexp "car.newcar")))
+      ("culture"
+       ("文化" "http://www.asahi.com/culture/list_culture.html" ,@culture)
+       ("芸能" "http://www.asahi.com/culture/list_entertainment.html"
+	,@culture)
+       ("藤沢周平の世界" "http://www.asahi.com/culture/fujisawa/"
+	,@(shimbun-asahi-make-regexp "culture.fujisawa"))
+       ("人間国宝" "http://www.asahi.com/culture/kokuhou/"
+	,@(shimbun-asahi-make-regexp "culture.kokuhou"))
+       ("いつかは名人会" "http://www.asahi.com/culture/column/rakugo/guide/"
+	,@(shimbun-asahi-make-regexp "culture.column.rakugo.guide"))
+       ("落語って" "http://www.asahi.com/culture/column/rakugo/kyosu/"
+	,@(shimbun-asahi-make-regexp "culture.column.rakugo.kyosu"))
+       ("ラクゴロク" "http://www.asahi.com/culture/column/rakugo/rakugoroku/"
+	,@(shimbun-asahi-make-regexp "culture.column.rakugo.rakugoroku"))
+       ("連載記事" "http://www.asahi.com/culture/serial_backnumber.html"
+	,@culture)
+       ("ゆるゆるフェミニン" "http://www.asahi.com/culture/column/yurufemi/"
+	,@(shimbun-asahi-make-regexp "culture.column.yurufemi")))
+      ("digital"
+       ("機器" "http://www.asahi.com/digital/av/"
+	,@(shimbun-asahi-make-regexp "digital.av"))
+       ("e-ビジネス情報 (提供: BCN)" "http://www.asahi.com/digital/bcnnews/"
+	,@(shimbun-asahi-make-regexp "digital.bcnnews"))
+       ("コラム" "http://www.asahi.com/digital/column01/"
+	,@(shimbun-asahi-make-regexp "digital.column01"))
+       ("ネット・ウイルス" "http://www.asahi.com/digital/internet/"
+	,@(shimbun-asahi-make-regexp "digital.internet"))
+       ("携帯電話" "http://www.asahi.com/digital/mobile/"
+	,@(shimbun-asahi-make-regexp "digital.mobile"))
+       ("日刊工業新聞ニュース" "http://www.asahi.com/digital/nikkanko/"
+	,@(shimbun-asahi-make-regexp "digital.nikkanko"))
+       ("ＰＣ・ゲーム" "http://www.asahi.com/digital/pc/"
+	,@(shimbun-asahi-make-regexp "digital.pc")))
+      ("edu"
+       ("入試" "http://www.asahi.com/edu/news/examination.html" ,@edu)
+       ("ゆき姐の子育て応援エッセー" "http://www.asahi.com/edu/column/ikuji/"
+	,@(shimbun-asahi-make-regexp "edu.column.ikuji"))
+       ("教育問題" "http://www.asahi.com/edu/news/issue.html" ,@edu)
+       ("この記事を手がかりに" "http://www.asahi.com/edu/nie/kiji/"
+	,@(shimbun-asahi-make-regexp "edu.nie.kiji.kiji"))
+       ("子育て" "http://www.asahi.com/edu/news/kosodate.html" ,@edu)
+       ("教育制度・話題" "http://www.asahi.com/edu/news/system.html" ,@edu)
+       ("ののちゃんのＤＯ科学" "http://www.asahi.com/edu/nie/tamate/"
+	,@(shimbun-asahi-make-regexp "edu.nie.tamate.kiji"))
+       ("大学" "http://www.asahi.com/edu/news/university.html" ,@edu))
+      ("food"
+       ("季節のおいしいコラム" "http://www.asahi.com/food/cooking/"
+	,@(shimbun-asahi-make-regexp "food.cooking"))
+       ("岸朝子「暮らしを楽しむお取り寄せ」"
+	"http://www.asahi.com/shopping/food/kishi/"
+	,(concat "<a" s1 "href=\"/"
+		 ;; 1. url
+		 "\\(shopping/food/kishi/"
+		 ;; 2. serial number
+		 "\\([a-z]*"
+		 ;; 3. year
+		 "\\(20[0-9][0-9]\\)"
+		 ;; 4. month
+		 "\\([01][0-9]\\)"
+		 ;; 5. day
+		 "\\([0-3][0-9]\\)"
+		 "[0-9]+\\)"
+		 "\\.html\\)"
+		 "\">" s0
+		 ;; 6. subject
+		 "\\(" no-nl "\\)"
+		 "\\(?:" s0 "<[^>]+>\\)*[^<]*([01]?[0-9]/[0-3]?[0-9])")
+	1 nil 2 6 3 4 5)
+       ("料理メモ" "http://www.asahi.com/food/memo/"
+	,@(shimbun-asahi-make-regexp "food.memo"))
+       ("「神の雫」作者のノムリエ日記"
+	"http://www.asahi.com/food/column/nommelier/"
+	,@(shimbun-asahi-make-regexp "food.column.nommelier"))
+       ("おいしさ発見" "http://www.asahi.com/food/column/oishisa/"
+	,@(shimbun-asahi-make-regexp "food.column.oishisa"))
+       ("論より、おやつ" "http://www.asahi.com/food/column/oyatsu/"
+	,@(shimbun-asahi-make-regexp "food.column.oyatsu"))
+       ("スイーツの心得" "http://www.asahi.com/food/column/sweets/"
+	,@(shimbun-asahi-make-regexp "food.column.sweets"))
+       ("ワインの歳時記" "http://www.asahi.com/food/column/wine_saijiki/"
+	,@(shimbun-asahi-make-regexp "food.column.wine_saijiki")))
+      ("health"
+       ("健康・生活" "http://www.asahi.com/health/news/" ,@health)
+       ("福祉・高齢" "http://www.asahi.com/health/news/aged.html" ,@health)
+       ("認知症特集" "http://www.asahi.com/health/news/alz.html" ,@health)
+       ("医療・病気" "http://www.asahi.com/health/news/medical.html" ,@health))
+      ("housing"
+       ("戸建て" "http://www.asahi.com/ad/clients/kodatenavi/news/"
+	,@(shimbun-asahi-make-regexp "ad.clients.kodatenavi.news"))
+       ("マンション" "http://www.asahi.com/ad/clients/mansionnavi/news/"
+	,@(shimbun-asahi-make-regexp "ad.clients.mansionnavi.news"))
+       ("天野彰のいい家いい家族" "http://www.asahi.com/housing/amano/"
+	,@(shimbun-asahi-make-regexp "housing.amano"))
+       ("住まいのお役立ちコラム" "http://www.asahi.com/housing/column/"
+	,@(shimbun-asahi-make-regexp "housing.column"))
+       ("小さな家の生活日記" "http://www.asahi.com/housing/diary/"
+	,@(shimbun-asahi-make-regexp "housing.diary"))
+       ("住宅新報社ニュース" "http://www.asahi.com/housing/jutaku-s/"
+	,@(shimbun-asahi-make-regexp "housing.jutaku-s"))
+       ("ここが知りたい" "http://www.asahi.com/housing/soudan/index_s.html"
+	,@(shimbun-asahi-make-regexp "housing.soudan"))
+       ("世界のウチ" "http://www.asahi.com/housing/world/"
+	,@(shimbun-asahi-make-regexp "housing.world")))
+      ("igo"
+       ("トピックス" "http://www.asahi.com/igo/topics/"
+	,@(shimbun-asahi-make-regexp "igo.topics")))
+      ("international.asia"
+       ("アジアの街角" "http://www.asahi.com/international/asiamachi/"
+	,@(shimbun-asahi-make-regexp "international.asiamachi"))
+       ("人民日報" "http://www.asahi.com/international/jinmin/"
+	,@(shimbun-asahi-make-regexp "international.jinmin"))
+       ("コリアうめーや！！" "http://www.asahi.com/international/korea/"
+	,@(shimbun-asahi-make-regexp "international.korea"))
+       ("スパイシー！ソウル" "http://www.asahi.com/international/seoul/"
+	,@(shimbun-asahi-make-regexp "international.seoul"))
+       ("週刊アジア" "http://www.asahi.com/international/weekly-asia/"
+	,@(shimbun-asahi-make-regexp "international.weekly-asia")))
+      ("international.column"
+       ("船橋洋一の世界ブリーフィング"
+	"http://opendoors.asahi.com/syukan/briefing/index.shtml"
+	,(concat
+	  "<a href=\""
+	  ;; 1. url
+	  "\\("
+	  ;; 2. serial number
+	  "\\([0-9]+\\)"
+	  "\\.shtml\\)"
+	  "\">No\\.[0-9]+　\\[ 週刊朝日"
+	  ;; 3. year
+	  "\\(20[0-9][0-9]\\)"
+	  "年"
+	  ;; 4. month
+	  "\\([01]?[0-9]\\)"
+	  "月"
+	  ;; 5. day
+	  "\\([0-3]?[0-9]\\)"
+	  "[^]]+\\] <br>"
+	  ;; 6. subject
+	  "\\([^<]+\\)")
+	1 2 nil 6 3 4 5)
+       ("姿月あさとの「独り言」" "http://www.asahi.com/international/shizuki/"
+	,@(shimbun-asahi-make-regexp "international.shizuki")))
+      ("international.special"
+       ("国際支援の現場から" "http://www.asahi.com/international/shien/"
+	,(concat
+	  "【＠[^】]+】[\t\n -]*<a" s1 "href=\"/"
+	  ;; 1. url
+	  "\\(international/shien/"
+	  ;; 2. serial number
+	  "\\([a-z]*"
+	  ;; 3. year
+	  "\\(20[0-9][0-9]\\)"
+	  ;; 4. month
+	  "\\([01][0-9]\\)"
+	  ;; 5. day
+	  "\\([0-3][0-9]\\)"
+	  "[0-9]+\\)"
+	  "\\.html\\)"
+	  "\">\\(?:" s0 "<[^>]+>\\)*" s0
+	  ;; 6. subject
+	  "\\([^\n<>]+\\)")
+	1 nil 2 6 3 4 5)
+       ("鳥インフルエンザ" "http://www.asahi.com/special/051102/"
+	,@(shimbun-asahi-make-regexp "special.051102"))
+       ("日中関係" "http://www.asahi.com/special/050410/"
+	,@(shimbun-asahi-make-regexp "special.050410"))
+       ("地球環境" "http://www.asahi.com/special/070110/"
+	,@(shimbun-asahi-make-regexp "special.070110"))
+       ("北朝鮮拉致事件" "http://www.asahi.com/special/abductees/"
+	,@(shimbun-asahi-make-regexp "special.abductees"))
+       ("ＢＳＥ問題" "http://www.asahi.com/special/bse/"
+	,@(shimbun-asahi-make-regexp "special.bse"))
+       ("イラク情勢" "http://www2.asahi.com/special/iraq/"
+	,@(shimbun-asahi-make-regexp "special.iraq"))
+       ("中東和平" "http://www.asahi.com/special/MiddleEast/"
+	,@(shimbun-asahi-make-regexp "special.MiddleEast"))
+       ("北朝鮮核問題" "http://www.asahi.com/special/nuclear/"
+	,@(shimbun-asahi-make-regexp "special.nuclear"))
+       ("中国特集" "http://www.asahi.com/world/china/"
+	,@(shimbun-asahi-make-regexp "world.china.news")))
+      ("international.world"
+       ("アフリカ" "http://www.asahi.com/international/africa.html"
+	,@international)
+       ("国連・その他" "http://www.asahi.com/international/etc.html"
+	,@international)
+       ("ヨーロッパ" "http://www.asahi.com/international/europe.html"
+	,@international)
+       ("中東" "http://www.asahi.com/international/middleeast.html"
+	,@international)
+       ("北米" "http://www.asahi.com/international/namerica.html"
+	,@international)
+       ("オセアニア" "http://www.asahi.com/international/oceania.html"
+	,@international)
+       ("中南米" "http://www.asahi.com/international/samerica.html"
+	,@international))
+      ("job"
+       ("週刊朝日・ＡＥＲＡから" "http://www.asahi.com/job/special/"
+	,@(let ((def (shimbun-asahi-make-regexp "job.special")))
+	    (cons (concat (car def)
+			  "\\(?:" s0 "<[^>]+>\\)*" s0 "（" s0
+			  ;; 7. extra
+			  "\\(" no-nl "\\)"
+			  "：")
+		  (append (cdr def) '(nil 7))))))
+      ("kansai"
+       ("関西芸能ニュース" "http://www.asahi.com/kansai/entertainment/news/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.news"))
+       ("イベント" "http://www.asahi.com/kansai/event/"
+	,@(shimbun-asahi-make-regexp "kansai.event")))
+      ("kansai.entertainment"
+       ("米朝口まかせ" "http://www.asahi.com/kansai/entertainment/beichou/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.beichou"))
+       ("勝手に関西世界遺産"
+	"http://www.asahi.com/kansai/entertainment/kansaiisan/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.kansaiisan"))
+       ("教えて！関西っ子"
+	"http://www.asahi.com/kansai/entertainment/kansaikko/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.kansaikko"))
+       ("三枝の笑ウインドウ"
+	"http://www.asahi.com/kansai/entertainment/sanshi/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.sanshi"))
+       ("千客万歳！" "http://www.asahi.com/kansai/entertainment/senkyaku/"
+	,@(shimbun-asahi-make-regexp "kansai.entertainment.senkyaku")))
+      ("kansai.kokoro"
+       ("○○のひみつ" "http://www.asahi.com/kansai/kokoro/himitsu/"
+	,@(shimbun-asahi-make-regexp "kansai.kokoro.himitsu"))
+       ("祈りの美" "http://www.asahi.com/kansai/kokoro/inori/"
+	,@(shimbun-asahi-make-regexp "kansai.kokoro.inori"))
+       ("ピンホールの目" "http://www.asahi.com/kansai/kokoro/pinhole/"
+	,@(shimbun-asahi-make-regexp "kansai.kokoro.pinhole"))
+       ("語りあう" "http://www.asahi.com/kansai/kokoro/taidan/"
+	,@(shimbun-asahi-make-regexp "kansai.kokoro.taidan"))
+       ("とみこうみ" "http://www.asahi.com/kansai/kokoro/tomikoumi/"
+	,@(shimbun-asahi-make-regexp "kansai.kokoro.tomikoumi")))
+      ("kansai.sumai"
+       ("ぷらっと沿線紀行" "http://www.asahi.com/kansai/sumai/ensen/"
+	,@(shimbun-asahi-make-regexp "kansai.sumai.ensen"))
+       ("街を恋う" "http://www.asahi.com/kansai/sumai/machi/"
+	,@(shimbun-asahi-make-regexp "kansai.sumai.machi"))
+       ("関西の住まい" "http://www.asahi.com/kansai/sumai/news/"
+	,@(shimbun-asahi-make-regexp "kansai.sumai.news")))
+      ("kansai.taberu"
+       ("デパ地下ＮＥＷＳ" "http://www.asahi.com/kansai/taberu/depa/"
+	,@(shimbun-asahi-make-regexp "kansai.taberu.depa"))
+       ("季語をいただく" "http://www.asahi.com/kansai/taberu/kigo/"
+	,@(shimbun-asahi-make-regexp "kansai.taberu.kigo"))
+       ("まんぷく会のランチタイム"
+	"http://www.asahi.com/kansai/taberu/manpuku/"
+	,@(shimbun-asahi-make-regexp "kansai.taberu.manpuku"))
+       ("パーンとスイーツ" "http://www.asahi.com/kansai/taberu/pan_sweets/"
+	,@(shimbun-asahi-make-regexp "kansai.taberu.pan_sweets"))
+       ("やさしい肴" "http://www.asahi.com/kansai/taberu/sakana/"
+	,@(shimbun-asahi-make-regexp "kansai.taberu.sakana")))
+      ("life.column"
+       ("心地よい生活の知恵" "http://www.asahi.com/life/column/chie/"
+	,@(shimbun-asahi-make-regexp "life.column.chie"))
+       ("私のミカタ" "http://www.asahi.com/life/column/mikata/"
+	,@(shimbun-asahi-make-regexp "life.column.mikata\\(?:/sasaki\\)?"))
+       ("荻原博子の“がんばれ！家計”"
+	"http://www.asahi.com/life/column/ogiwara/"
+	,@(shimbun-asahi-make-regexp "life.column.ogiwara")))
+      ("national"
+       ("災害・交通情報" "http://www.asahi.com/national/calamity.html"
+	,@national)
+       ("その他・話題" "http://www.asahi.com/national/etc.html" ,@national)
+       ("事件・事故" "http://www.asahi.com/national/incident.html" ,@national)
+       ("裁判" "http://www.asahi.com/national/trial.html" ,@national)
+       ("おくやみ" "http://www.asahi.com/obituaries/"
+	,(format (car default) "obituaries") ,@(cdr default)))
+      ("politics"
+       ("国政" "http://www.asahi.com/politics/government.html" ,@politics)
+       ("地方政治" "http://www.asahi.com/politics/local.html" ,@politics))
+      ("shopping.column"
+       ("楽天こだわり店長に聞く" "http://www.asahi.com/shopping/column/master/"
+	,@shopping)
+       ("暮らしを楽しむ" "http://www.asahi.com/shopping/column/tatsujin/"
+	,@shopping))
+      ("shopping.yakimono"
+       ("小野公久「やきものガイド」"
+	"http://www.asahi.com/shopping/yakimono/ono/" ,@shopping2)
+       ("ロバート・イエリン「やきもの散歩道」"
+	"http://www.asahi.com/shopping/yakimono/yellin/" ,@shopping2))
+      ("shougi"
+       ("本" "http://www.asahi.com/shougi/books/"
+	,@(shimbun-asahi-make-regexp "shougi.books"))
+       ("ニュース" "http://www.asahi.com/shougi/news/"
+	,@(shimbun-asahi-make-regexp "shougi.news"))
+       ("トピックス" "http://www.asahi.com/shougi/topics/"
+	,@(shimbun-asahi-make-regexp "shougi.topics")))
+      ("sports.baseball"
+       ("アマチュア野球" "http://www.asahi.com/sports/bb/ama.html" ,@baseball)
+       ("大リーグ" "http://www.asahi.com/sports/bb/mlb.html" ,@baseball)
+       ("プロ野球" "http://www.asahi.com/sports/bb/pro.html" ,@baseball))
+      ("sports.battle"
+       ("格闘技" "http://www.asahi.com/sports/spo/battle.html"
+	,@(shimbun-asahi-make-regexp "sports.\\(?:column\\|spo\\)"))
+       ("相撲" "http://www.asahi.com/sports/spo/sumo.html" ,@sports))
+      ("sports.etc"
+       ("コラム" "http://www.asahi.com/sports/column/"
+	,@(shimbun-asahi-make-regexp "sports.column"))
+       ("国外一般スポーツ" "http://www.asahi.com/sports/spo/kaigai.html"
+	,@sports)
+       ("国内一般スポーツ" "http://www.asahi.com/sports/spo/kokunai.html"
+	,@sports)
+       ("レーシング" "http://www.asahi.com/sports/spo/motor.html" ,@sports))
+      ("sports.football"
+       ("日本代表" "http://www.asahi.com/sports/fb/japan/list.html"
+	,@(shimbun-asahi-make-regexp "sports.fb.japan"))
+       ("Ｊリーグ・国内" "http://www.asahi.com/sports/fb/national.html"
+	,@football)
+       ("海外" "http://www.asahi.com/sports/fb/world.html" ,@football))
+      ("sports.golf"
+       ("男子ゴルフ" "http://www.asahi.com/sports/spo/golf_man.html" ,@sports)
+       ("女子ゴルフ" "http://www.asahi.com/sports/spo/golf_woman.html"
+	,@sports))
+      ("sports.rugby"
+       ("日本代表" "http://www.asahi.com/sports/spo/rugby_japan.html" ,@sports)
+       ("国内・その他" "http://www.asahi.com/sports/spo/rugby_national.html"
+	,@sports))
+      ("sports.usa"
+       ("ＮＢＡ" "http://www.asahi.com/sports/spo/nba.html" ,@sports)
+       ("ＮＦＬ" "http://www.asahi.com/sports/spo/nfl.html" ,@sports)
+       ("ＮＨＬ" "http://www.asahi.com/sports/spo/nhl.html" ,@sports))
+      ("sports.winter"
+       ("スケート・氷上競技" "http://www.asahi.com/sports/spo/skate.html"
+	,@sports)
+       ("スキー・雪上競技" "http://www.asahi.com/sports/spo/ski.html"
+	,@sports))
+      ("travel"
+       ("旅する人のアペリティフ" "http://www.asahi.com/travel/aperitif/"
+	,(format (car travel) "travel/aperitif") ,@(cdr travel))
+       ("ぽれぽれサファリ" "http://www.asahi.com/travel/porepore/"
+	,@(shimbun-asahi-make-regexp "travel.porepore"))
+       ("島旅たび" "http://www.asahi.com/travel/shima/"
+	,(format (car travel) "travel/shima") ,@(cdr travel))
+       ("週刊シルクロード紀行" "http://www.asahi.com/travel/silkroad/"
+	,@(shimbun-asahi-make-regexp "travel.silkroad"))
+       ("愛の旅人" "http://www.asahi.com/travel/traveler/"
+	,(format (car travel) "travel/traveler") ,@(cdr travel)))))
+  "Alist of parent groups and lists of tables for subgroups.
+Each table is the same as the `cdr' of the element of
+`shimbun-asahi-group-table'.")
 
 (defvar shimbun-asahi-content-start
-  "<!--[\t\n ]*Start of Kiji[\t\n ]*-->\
+  "<div[\t\n ]+class=\"\
+\\(?:ThmbSet300Tb\\|ThmbSet256\\|Kansai-ThmbSet100\\|ThmbCol\\)\">\
+\\|<!--[\t\n ]*End of Headline[\t\n ]*-->\
+\\(?:[\t\n ]*<div[\t\n ]+[^<]+</div>[\t\n ]*\
+\\|[\t\n ]*<p[\t\n ]+[^<]+</p>[\t\n ]*\\)?\
+\\|<!--[\t\n ]*Start of \\(Kiji\\|photo\\)[\t\n ]*-->\
 \\|<!--[\t\n ]*FJZONE START NAME=\"HONBUN\"[\t\n ]*-->")
 
 (defvar shimbun-asahi-content-end
-  "<!--[\t\n ]*End of Kiji[\t\n ]*-->\
+  "<dl[\t\n ]+class=\"PrInfo\">\
+\\|<!--[\t\n ]*google_ad_section_end\
+\\|<!-[^>]+[^>★]ここまで[\t\n ]*-+>\
+\\|\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*<!--[\t\n ]*Start of hatenab[\t\n ]*-->\
+\\|<!--[\t\n ]*End of Kiji[\t\n ]*-->\
+\\|<!--[\t\n ]*End of related link[\t\n ]*-->\
+\\|<!--[\t\n ]*FJZONE END NAME=\"HONBUN\"[\t\n ]*-->")
+
+(defvar shimbun-asahi-text-content-start
+  "<div[\t\n ]+class=\"\\(?:ThmbSet256\\|Kansai-ThmbSet100\\|ThmbCol\\)\">\
+\\|<!--[\t\n ]*End of Headline[\t\n ]*-->\
+\\(?:[\t\n ]*<div[\t\n ]+[^<]+</div>[\t\n ]*\
+\\|[\t\n ]*<p[\t\n ]+[^<]+</p>[\t\n ]*\\)?\
+\\|<!--[\t\n ]*Start of Kiji[\t\n ]*-->\
+\\|<!--[\t\n ]*FJZONE START NAME=\"HONBUN\"[\t\n ]*-->")
+
+(defvar shimbun-asahi-text-content-end
+  "<dl[\t\n ]+class=\"PrInfo\">\
+\\|<!--[\t\n ]*google_ad_section_end\
+\\|<!-[^>]+ここまで[\t\n ]*-+>\
+\\|\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*<!--[\t\n ]*Start of hatenab[\t\n ]*-->\
+\\|<!--[\t\n ]*\\(?:google_ad_section\\|[AD★☆]+\\)\
+\\|<!--[\t\n ]*End of Kiji[\t\n ]*-->\
 \\|<!--[\t\n ]*FJZONE END NAME=\"HONBUN\"[\t\n ]*-->")
 
 (defvar shimbun-asahi-x-face-alist
-  '(("default" . "X-Face: +Oh!C!EFfmR$+Zw{dwWW]1e_>S0rnNCA*CX|\
-bIy3rr^<Q#lf&~ADU:X!t5t>gW5)Q]N{Mmn\n L]suPpL|gFjV{S|]a-:)\\FR\
-7GRf9uL:ue5_=;h{V%@()={uTd@l?eXBppF%`6W%;h`#]2q+f*81n$B\n h|t")))
+  '(("default" . "\
+Face: iVBORw0KGgoAAAANSUhEUgAAAEIAAAAQBAMAAABQPLQnAAAAElBMVEX8rKjd3Nj+7utdXFr
+ ////oOTn0UMNfAAAA90lEQVQoz21SQWoDMQwUprlXWA8IZvsAd/yA2KsHLKX+/1c6cklI2EgGeTW
+ jwYxW/F2Uq0zGIcWHPAO5ut+SF7nMeyQ/Mb6OqwhnGSOE0gtjb9Q4JG33xqCYeM/mvVqUXOtY+Lp
+ 37XqbIp4BB9p/wef8IAF1BxQRRoaiIzcWQ4Vdfp2f0aiItKXRSWUxjhk1OjqR3NDYMomBkEVIdYy
+ 56Q6SbOEKlz0kQy5jZ95mYVvrQpWN0ADB9axMje/5QzAeXvsSbbQvqavxKA3QIpt655XHmOphcHo
+ YJJJOO5Kw7QiXSrh9JnAv47GmJ7tfGD7Wqrnp7e2f8AfqrGxn9j9f+QAAAABJRU5ErkJggg==")))
+;;  '(("default" . "X-Face: +Oh!C!EFfmR$+Zw{dwWW]1e_>S0rnNCA*CX|\
+;;bIy3rr^<Q#lf&~ADU:X!t5t>gW5)Q]N{Mmn\n L]suPpL|gFjV{S|]a-:)\\FR\
+;;7GRf9uL:ue5_=;h{V%@()={uTd@l?eXBppF%`6W%;h`#]2q+f*81n$B\n h|t")))
 
 (defvar shimbun-asahi-expiration-days 6)
 
@@ -365,6 +989,8 @@
   ;; successor `shimbun-asahi-html'.
   (shimbun-set-x-face-alist-internal shimbun shimbun-asahi-x-face-alist)
   (shimbun-set-expiration-days-internal shimbun shimbun-asahi-expiration-days)
+  (shimbun-set-content-start-internal shimbun shimbun-asahi-content-start)
+  (shimbun-set-content-end-internal shimbun shimbun-asahi-content-end)
   shimbun)
 
 (luna-define-method shimbun-groups ((shimbun shimbun-asahi))
@@ -376,10 +1002,16 @@
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-asahi))
   (let* ((group (shimbun-current-group-internal shimbun))
-	 (index (nth 2 (assoc group shimbun-asahi-group-table))))
-    (if (string-match "\\`http:" index)
-	index
-      (concat shimbun-asahi-url (format index group)))))
+	 (index (or (nth 2 (assoc group shimbun-asahi-group-table))
+		    (concat (shimbun-subst-char-in-string ?. ?/ group) "/"))))
+    (cond ((not index)
+	   "about:blank")
+	  ((string-match "\\`http:" index)
+	   index)
+	  ((string-match "\\`book\\." group)
+	   (shimbun-expand-url (substring index 5) "http://book.asahi.com/"))
+	  (t
+	   (shimbun-expand-url (format index group) shimbun-asahi-url)))))
 
 (defun shimbun-asahi-get-headers (shimbun)
   "Return a list of headers."
@@ -387,157 +1019,180 @@
 	(from (concat (shimbun-server-name shimbun)
 		      " (" (shimbun-current-group-name shimbun) ")"))
 	(case-fold-search t)
-	regexp jname numbers cyear cmonth rss-p paper-p en-category
+	regexp jname numbers book-p cyear cmonth rss-p paper-p en-category
 	hour-min month year day serial num extra rgroup id headers
-	backnumbers)
+	travel-p subgroups iraq-p)
     (setq regexp (assoc group shimbun-asahi-group-table)
 	  jname (nth 1 regexp)
 	  numbers (nthcdr 4 regexp)
-	  regexp (format (nth 3 regexp)
-			 (regexp-quote (shimbun-subst-char-in-string
-					?. ?/ group)))
-	  cyear (decode-time)
+	  book-p (string-match "\\`book\\." group))
+    (when (setq regexp (nth 3 regexp))
+      (setq regexp (format regexp
+			   (regexp-quote (shimbun-subst-char-in-string
+					  ?. ?/ (if book-p
+						    (substring group 5)
+						  group))))))
+    (setq cyear (shimbun-decode-time nil 32400)
 	  cmonth (nth 4 cyear)
 	  cyear (nth 5 cyear)
-	  rss-p (string-equal group "rss")
-	  paper-p (member group '("editorial" "tenjin")))
+	  rss-p (member group '("book" "rss"))
+	  paper-p (member group '("editorial" "tenjin"))
+	  travel-p (string-equal group "travel")
+	  subgroups (cdr (assoc group shimbun-asahi-subgroups-alist)))
+    (shimbun-strip-cr)
+    (goto-char (point-min))
     (catch 'stop
-      ;; The loop for fetching all the articles in the whitemail group.
+      ;; The loop for fetching all the articles in the subgroups.
       (while t
-	(while (re-search-forward regexp nil t)
-	  (cond ((string-equal group "english")
-		 (setq en-category
-		       (save-excursion
-			 (save-match-data
-			   (if (re-search-backward "\
-<h[0-9]\\([\n\t ]+[^>]+\\)?>[\t\n ]*\\([^&]+\\)[\t\n ]*&#[0-9]+"
-						   nil t)
-			       (downcase (match-string 2)))))))
-		(t
-		 (setq hour-min
-		       (save-excursion
-			 (save-match-data
-			   (if (re-search-forward "\
-<span[\t\n ]+[^>]+>[\t\n ]*(\\([01]?[0-9]/[0-3]?[0-9][\t\n ]+\\)?
+	(when regexp
+	  (while (re-search-forward regexp nil t)
+	    (cond ((string-equal group "english")
+		   (setq en-category
+			 (save-excursion
+			   (save-match-data
+			     (if (re-search-backward "\
+<h[0-9]\\(?:[\n\t ]+[^>]+\\)?>[\t\n ]*\\([^&]+\\)[\t\n ]*&#[0-9]+"
+						     nil t)
+				 (downcase (match-string 1)))))))
+		  (t
+		   (setq hour-min
+			 (save-excursion
+			   (save-match-data
+			     (if (re-search-forward "\
+<span[\t\n ]+[^>]+>[\t\n ]*(\\(?:[01]?[0-9]/[0-3]?[0-9][\t\n ]+\\)?
 \\([012]?[0-9]:[0-5][0-9]\\))[\t\n ]*</span>"
-						  nil t)
-			       (match-string 2)))))))
-	  (setq month (string-to-number (match-string (nth 5 numbers)))
-		year (if (setq num (nth 4 numbers))
-			 (string-to-number (match-string num))
-		       (cond ((>= (- month cmonth) 2)
-			      (1- cyear))
-			     ((and (= 1 month) (= 12 cmonth))
-			      (1+ cyear))
-			     (t
-			      cyear)))
-		day (string-to-number (match-string (nth 6 numbers)))
-		serial (cond (rss-p
-			      (format "%d%s.%s"
-				      year
-				      (match-string (nth 1 numbers))
-				      (match-string (nth 2 numbers))))
-			     (paper-p
-			      (format "%d%02d%02d" year month day))
-			     ((and (setq num (nth 1 numbers))
-				   (match-beginning num))
-			      (format "%d%02d%02d.%s"
-				      year month day (match-string num)))
-			     (t
-			      (shimbun-subst-char-in-string
-			       ?/ ?.
-			       (downcase (match-string (nth 2 numbers))))))
-		extra (or (and (setq num (nth 8 numbers))
-			       (match-beginning num)
-			       (match-string num))
-			  (and (setq num (nth 9 numbers))
-			       (match-beginning num)
-			       (match-string num)))
-		rgroup (mapconcat 'identity
-				  (nreverse (save-match-data
-					      (split-string group "\\.")))
-				  ".")
-		id (if (and extra
-			    (not (member group '("job.special"))))
-		       (concat "<" serial "%" extra "." rgroup "."
-			       shimbun-asahi-top-level-domain ">")
-		     (concat "<" serial "%" rgroup "."
-			     shimbun-asahi-top-level-domain ">")))
-	  (unless (and (shimbun-search-id shimbun id)
-		       (if backnumbers
-			   (throw 'stop nil)
-			 ;; Don't stop it since there might be more new
-			 ;; articles even if the same links are repeated.
-			 t))
-	    (push (shimbun-create-header
-		   ;; number
-		   0
-		   ;; subject
-		   (cond (rss-p
-			  (match-string (nth 3 numbers)))
-			 (en-category
-			  (concat "[" en-category "] "
-				  (match-string (nth 3 numbers))))
-			 ((and (setq num (nth 8 numbers))
-			       (match-beginning num))
-			  (concat "[" (match-string num) "] "
-				  (match-string (nth 3 numbers))))
-			 ((and (setq num (nth 9 numbers))
-			       (match-beginning num))
-			  (concat "[" (match-string num) "] "
-				  (match-string (nth 3 numbers))))
-			 (paper-p
-			  (concat jname (format " (%d/%d)" month day)))
-			 (t
-			  (match-string (nth 3 numbers))))
-		   ;; from
-		   (if (and rss-p
-			    (setq num (nth 10 numbers))
-			    (setq num (match-string num)))
-		       (save-match-data
-			 (shimbun-replace-in-string
-			  from "(RSS" (concat "\\&:" num)))
-		     from)
-		   ;; date
-		   (shimbun-make-date-string
-		    year month day (cond ((and (setq num (nth 7 numbers))
-					       (match-beginning num))
-					  (match-string num))
-					 (paper-p
-					  "07:00")
-					 (t
-					  hour-min)))
-		   ;; id
-		   id
-		   ;; references, chars, lines
-		   "" 0 0
-		   ;; xref
-		   (shimbun-expand-url
-		    (match-string (nth 0 numbers))
-		    (if paper-p
-			(concat shimbun-asahi-url "paper/")
-		      shimbun-asahi-url)))
-		  headers)))
-	(if (string-equal group "nankyoku.whitemail")
+						    nil t)
+				 (match-string 1)))))))
+	    (setq month (string-to-number (match-string (nth 5 numbers)))
+		  year (if (setq num (nth 4 numbers))
+			   (string-to-number (match-string num))
+			 (cond ((>= (- month cmonth) 2)
+				(1- cyear))
+			       ((and (= 1 month) (= 12 cmonth))
+				(1+ cyear))
+			       (t
+				cyear)))
+		  day (string-to-number (match-string (nth 6 numbers)))
+		  serial (cond (rss-p
+				(if (match-beginning (nth 1 numbers))
+				    (format "%d%s.%s"
+					    year
+					    (match-string (nth 1 numbers))
+					    (match-string (nth 2 numbers)))
+				  (match-string (nth 2 numbers))))
+			       (paper-p
+				(format "%d%02d%02d" year month day))
+			       ((and (setq num (nth 1 numbers))
+				     (match-beginning num))
+				(format "%d%02d%02d.%s"
+					year month day (match-string num)))
+			       (t
+				(shimbun-subst-char-in-string
+				 ?/ ?.
+				 (downcase (match-string (nth 2 numbers))))))
+		  extra (or (and (setq num (nth 8 numbers))
+				 (match-beginning num)
+				 (match-string num))
+			    (and (setq num (nth 9 numbers))
+				 (match-beginning num)
+				 (match-string num)))
+		  rgroup (mapconcat 'identity
+				    (nreverse (save-match-data
+						(split-string group "\\.")))
+				    ".")
+		  id (if (and extra
+			      (not (save-match-data
+				     (string-match "週刊朝日・ＡＥＲＡから"
+						   from))))
+			 (concat "<" serial "%" extra "." rgroup "."
+				 shimbun-asahi-top-level-domain ">")
+		       (concat "<" serial "%" rgroup "."
+			       shimbun-asahi-top-level-domain ">")))
+	    (unless (shimbun-search-id shimbun id)
+	      (push (shimbun-create-header
+		     ;; number
+		     0
+		     ;; subject
+		     (cond (rss-p
+			    (match-string (nth 3 numbers)))
+			   (en-category
+			    (concat "[" en-category "] "
+				    (match-string (nth 3 numbers))))
+			   ((and (setq num (nth 8 numbers))
+				 (match-beginning num))
+			    (concat "[" (match-string num) "] "
+				    (match-string (nth 3 numbers))))
+			   ((and (setq num (nth 9 numbers))
+				 (match-beginning num))
+			    (concat "[" (match-string num) "] "
+				    (match-string (nth 3 numbers))))
+			   (paper-p
+			    (concat jname (format " (%d/%d)" month day)))
+			   (travel-p
+			    (save-match-data
+			      (shimbun-replace-in-string
+			       (match-string (nth 3 numbers))
+			       "\\(?:[\t\n 　]*&#[0-9]+;\\)*[\t\n 　]*" "")))
+			   (t
+			    (match-string (nth 3 numbers))))
+		     ;; from
+		     (if (and rss-p
+			      (setq num (nth 10 numbers))
+			      (setq num (match-string num)))
+			 (save-match-data
+			   (when (and book-p
+				      (string-match
+				       "\\`書評　\\[評者\\]\\(その他\\)?" num))
+			     (setq num (if (match-beginning 1)
+					   "書評"
+					 (substring num (match-end 0)))))
+			   (shimbun-replace-in-string
+			    from "(RSS" (concat "(" num)))
+		       from)
+		     ;; date
+		     (shimbun-make-date-string
+		      year month day
+		      (cond ((and (setq num (nth 11 numbers))
+				  (match-beginning num))
+			     (concat (match-string num) ":"
+				     (match-string (nth 12 numbers))))
+			    ((and (setq num (nth 7 numbers))
+				  (match-beginning num))
+			     (match-string num))
+			    (paper-p
+			     "07:00")
+			    (t
+			     hour-min)))
+		     ;; id
+		     id
+		     ;; references, chars, lines
+		     "" 0 0
+		     ;; xref
+		     (shimbun-expand-url
+		      (match-string (nth 0 numbers))
+		      (cond (paper-p
+			     (concat shimbun-asahi-url "paper/"))
+			    (book-p
+			     "http://book.asahi.com/")
+			    ((string-match "船橋洋一の世界ブリーフィング" from)
+			     "http://opendoors.asahi.com/syukan/briefing/")
+			    (iraq-p
+			     "http://www2.asahi.com/")
+			    (t
+			     shimbun-asahi-url))))
+		    headers)))
+	  (when (string-match "私のミカタ" from)
+	    (setq headers (nreverse headers))))
+	(if subgroups
 	    (progn
-	      (cond ((eq backnumbers 'stop)
-		     (throw 'stop nil))
-		    ((null backnumbers)
-		     (while (re-search-forward "<a[\t\n ]+href=\"\
-\\(http://www\\.asahi\\.com/nankyoku/whitemail/\
-backnum0[345][01][0-9]\\.html\\)\">"
-					       nil t)
-		       (unless (member (setq id (match-string 1)) backnumbers)
-			 (push id backnumbers)))))
-	      (if backnumbers
-		  (progn
-		    (shimbun-retrieve-url
-		     (prog1
-			 (car backnumbers)
-		       (erase-buffer)
-		       (unless (setq backnumbers (cdr backnumbers))
-			 (setq backnumbers 'stop)))))
-		(throw 'stop nil)))
+	      (erase-buffer)
+	      (setq from (concat (shimbun-server-name shimbun)
+				 " (" (caar subgroups) ")")
+		    iraq-p (string-equal (caar subgroups) "イラク情勢"))
+	      (shimbun-retrieve-url (cadar subgroups))
+	      (setq regexp (caddar subgroups)
+		    numbers (cdddar subgroups)
+		    subgroups (cdr subgroups)))
 	  (throw 'stop nil))))
     (append (shimbun-sort-headers headers)
 	    (shimbun-asahi-get-headers-for-today group jname from))))
@@ -552,22 +1207,27 @@
   (goto-char (point-min))
   (let ((basename (cdr (assoc group '(("editorial" . "editorial")
 				      ("tenjin" . "column")))))
-	year month day url)
+	year cmonth month day url)
     (when (and basename
 	       (re-search-forward
-		(concat
-		 ;; 1. year
-		 "\\(20[0-9][0-9]\\)" "年"
-		 ;; 2. month
-		 "\\([01]?[0-9]\\)" "月"
-		 ;; 3. day
-		 "\\([0-3]?[0-9]\\)" "日"
-		 "（.曜日）付")
+		(eval-when-compile
+		  (concat
+		   "/\\(?:editorial\\|column\\)\\.html\"[^\n0-9]+"
+		   ;; 1. month
+		   "\\([01]?[0-9]\\)" "月"
+		   ;; 2. day
+		   "\\([0-3]?[0-9]\\)" "日付"))
 		nil t))
-      (setq year (string-to-number (match-string 1))
-	    month (string-to-number (match-string 2))
-	    day (string-to-number (match-string 3))
-	    url (format "paper/%s%d%02d%02d.html" basename year month day))
+      (setq year (shimbun-decode-time nil 32400)
+	    cmonth (nth 4 year)
+	    year (nth 5 year)
+	    month (string-to-number (match-string 1))
+	    day (string-to-number (match-string 2)))
+      (cond ((and (= cmonth 1) (= month 12))
+	     (decf year))
+	    ((and (= cmonth 12) (= month 1))
+	     (incf year)))
+      (setq url (format "paper/%s%d%02d%02d.html" basename year month day))
       (list
        (shimbun-make-header
 	;; number
@@ -587,100 +1247,363 @@
 	;; xref
 	(shimbun-expand-url url shimbun-asahi-url))))))
 
+(defun shimbun-asahi-multi-next-url (shimbun header url)
+  (goto-char (point-min))
+  (when (and (re-search-forward "\
+<div[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"SeqNav forSplit\""
+				nil t)
+	     (shimbun-end-of-tag "div" t))
+    (let ((end (match-beginning 0)))
+      (prog1
+	  (when (re-search-backward "\
+<a[\t\n ]+href=\"\\([^\"]+\\)\"[^>]*>[\t\n ]*次ページ[\t\n ]*</a>"
+				    end 'move)
+	    (goto-char end)
+	    (shimbun-expand-url (match-string 1) url))
+	(if (and (re-search-backward "[^\t\n >]\\([\t\n ]*<\\)" nil t)
+		 (re-search-forward "[\t\n ]*<[\t\n ]*[^/]" end t))
+	    (delete-region (match-beginning 0) end)
+	  (goto-char end))
+	(insert "<!-- End of Kiji -->\n")))))
+
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-asahi)
+					    header url)
+  (shimbun-asahi-multi-next-url shimbun header url))
+
 (defun shimbun-asahi-prepare-article (shimbun header)
   "Prepare an article.
-Extract the article core on some groups or adjust a date header if
-there is a correct information available.  For the groups editorial
-and tenjin, it tries to fetch the article for that day if it failed."
+For the groups editorial and tenjin, it tries to fetch the article for
+that day if it failed."
   (let ((case-fold-search t)
-	(group (shimbun-current-group-internal shimbun)))
+	(group (shimbun-current-group-internal shimbun))
+	(from (shimbun-header-from-internal header)))
     (cond
+     ((string-equal group "car")
+      (shimbun-remove-tags "\
+\[\t\n ]*<![\t\n ]*-+[\t\n ]*[★☆]+[\t\n ]*AD[\t\n ]*[★☆]+[\t\n ]*-+>"
+			   "\
+<![\t\n ]*-+[\t\n ]*/[\t\n ]*[★☆]+[\t\n ]*AD[\t\n ]*[★☆]+[\t\n ]*-+>\
+\[\t\n ]*")
+      (goto-char (point-min))
+      (when (and (re-search-forward (shimbun-content-start shimbun) nil t)
+		 (re-search-forward "\
+\[\t\n ]*<!-+[\t\n ]*Creative[\t\n ]+for[\t\n ]+"
+				    nil t))
+	(goto-char (match-beginning 0))
+	(insert "\n<!-- End of Kiji -->\n")))
+     ((string-equal group "digital")
+      (shimbun-remove-tags "\
+\[\t\n ]*<![\t\n ]*-+[\t\n ]*[★☆]+[\t\n ]*AD[\t\n ]*[★☆]+[\t\n ]*-+>"
+			   "\
+<![\t\n ]*-+[\t\n ]*/[\t\n ]*[★☆]+[\t\n ]*AD[\t\n ]*[★☆]+[\t\n ]*-+>\
+\[\t\n ]*")
+      (cond ((string-match "コラム" from)
+	     (unless (re-search-forward (shimbun-content-end shimbun) nil t)
+	       (when (re-search-forward "\\(?:[\t\b ]*<[^>]+>\\)*[\t\n ]*\
+\\(?:<img[\t\n ]+src=\"[^>]*[\t\n ]*alt=\"プロフィール\"\
+\\|<h[0-9]>プロフィール</h[0-9]>\\)"
+					nil t)
+		 (goto-char (match-beginning 0))
+		 (insert "\n<!-- End of Kiji -->\n"))))))
      ((string-equal group "editorial")
-      (let ((regexp "\
-<h[0-9]\\([\t\n ]+[^>]+\\)?>[\t\n ]*<a[\t\n ]+name=\"syasetu[0-9]+\">")
+      (let ((url (shimbun-header-xref header))
 	    (retry 0)
-	    index)
-	(while (<= retry 1)
-	  (if (re-search-forward regexp nil t)
+	    start)
+	(while retry
+	  (if (progn
+		(while (and (re-search-forward "\
+<\\(h[0-9]+\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"bdr_btm_2px"
+					       nil t)
+			    (shimbun-end-of-tag (match-string 1) t)
+			    (if start
+				(progn
+				  (delete-region
+				   (goto-char (match-beginning 0))
+				   (match-beginning 1))
+				  (insert "\n&#012;\n")
+				  (forward-char 1))
+			      (setq start (match-beginning 1)))))
+		(and start
+		     (re-search-forward "[\t\n ]*\
+\\(?:<ul[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"FollowLnk\
+\\|<li[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"TopLnk\"\
+\\|<dl[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"PrInfo\"\\)"
+					nil t)))
 	      (progn
 		(goto-char (match-beginning 0))
+		(setq retry nil)
+		(insert "\n<!-- End of Kiji -->")
+		(goto-char start)
 		(insert "<!-- Start of Kiji -->")
-		(when index
+		(when (string-match "/editorial\\.html\\'" url)
 		  (insert "\
-\n<p>(指定された&nbsp;url&nbspが&nbspまだ/すでに&nbsp無いので、\
-<a href=\"" index "\">トップページ</a> から記事を取得しました)</p>\n"))
-		(search-forward "</a>" nil t)
-		(while (re-search-forward regexp nil t))
-		(when (re-search-forward "[\n\t ]*</p>" nil t)
-		  (insert "\n<!-- End of Kiji -->"))
-		(setq retry 255))
+\n<p>(指定された&nbsp;url&nbsp;が&nbsp;まだ/すでに&nbsp;無いので、\
+<a href=\"" url "\">トップページ</a> から記事を取得しました)</p>\n")))
 	    (erase-buffer)
-	    (if (zerop retry)
-		(progn
-		  (shimbun-retrieve-url (setq index
-					      (shimbun-index-url shimbun)))
-		  (goto-char (point-min)))
-	      (insert "Couldn't retrieve the page.\n")))
-	  (setq retry (1+ retry)))))
+	    (if (= retry 1)
+		(setq retry nil)
+	      (setq url "http://www.asahi.com/paper/editorial.html"
+		    retry 1
+		    start nil)
+	      (shimbun-header-set-xref header url)
+	      (shimbun-fetch-url shimbun url)
+	      (goto-char (point-min)))))))
+     ((string-equal group "food")
+      (when (and (re-search-forward (shimbun-content-start shimbun) nil t)
+		 (re-search-forward "[\t\n ]*<!-+[\t\n ]+Creative[\t\n ]+for"
+				    nil t))
+	(goto-char (match-beginning 0))
+	(insert "\n<!-- End of Kiji -->\n")))
+     ((string-equal group "housing")
+      (shimbun-remove-tags
+       "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*<!--広告スキップ -->"
+       "<!--/広告スキップのとび先-->[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*")
+      (when (string-match "マンション\\|戸建て" from)
+	(goto-char (point-min))
+	(re-search-forward "<td[\t\n ]+valign=\"top\">[\t\n ]*\
+\\(?:<[^>]+>[\t\n ]*\\)*"
+			   nil t)
+	(insert "<!-- Start of Kiji -->")
+	(when (re-search-forward "[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*</td>"
+				 nil 'move)
+	  (goto-char (match-beginning 0))
+	  (insert "<!-- End of Kiji -->"))))
+     ((string-equal group "rss"))
      ((string-equal group "tenjin")
-      (let ((retry 0)
-	    index)
-	(while (<= retry 1)
-	  (if (and (search-forward "【天声人語】" nil t)
-		   (re-search-forward "<SPAN STYLE=[^>]+>[\t\n ]*" nil t))
-	      (progn
-		(insert "<!-- Start of Kiji -->")
-		(when index
+      (let ((url (shimbun-header-xref header))
+	    (retry 0)
+	    start)
+	(while retry
+	  (if (and (re-search-forward "\
+<p>20[0-9][0-9]年[01]?[0-9]月[0-3]?[0-9]日（[日月火水木金土]）付</p>\
+\\(\\(?:[\t\n ]*印刷\\)?[\t\n ]*<[^>]+>\\)+[\t\n ]*"
+				      nil t)
+		   (progn
+		     (setq start (match-end 0))
+		     (re-search-forward "[\t\n ]*</p>" nil t)))
+	      (save-restriction
+		(narrow-to-region start (goto-char (match-beginning 0)))
+		(setq retry nil)
+		(insert "</p>\n<!-- End of Kiji -->")
+		(goto-char start)
+		(insert "<!-- Start of Kiji --><p>")
+		(when (string-match "/column\\.html\\'" url)
 		  (insert "\
-\n<p>(指定された&nbsp;url&nbspが&nbspまだ/すでに&nbsp無いので、\
-<a href=\"" index "\">トップページ</a> から記事を取得しました)</p>\n"))
-		(while (re-search-forward "[\t\n ]*<SPAN STYLE=[^>]+>[\t\n ]*"
-					  nil t)
-		  (delete-region (match-beginning 0) (match-end 0)))
-		(when (re-search-forward "[\t\n ]*</SPAN>" nil t)
-		  (goto-char (match-beginning 0))
-		  (insert "\n<!-- End of Kiji -->"))
-		(setq retry 255))
+\n<p>(指定された&nbsp;url&nbsp;が&nbsp;まだ/すでに&nbsp;無いので、\
+<a href=\"" url "\">トップページ</a> から記事を取得しました)</p>\n"))
+		(while (re-search-forward
+			(eval-when-compile
+			  (concat "[▼"
+				  (condition-case nil
+				      (list (make-char 'mule-unicode-2500-33ff
+						       33 124))
+				    (error nil))
+				  "]"))
+			nil t)
+		  (replace-match "。</p>\n<p>　")))
 	    (erase-buffer)
-	    (if (zerop retry)
-		(progn
-		  (shimbun-retrieve-url (setq index
-					      (shimbun-index-url shimbun)))
-		  (goto-char (point-min)))
-	      (insert "Couldn't retrieve the page.\n")))
-	  (setq retry (1+ retry)))))
-     (t
-      (when (re-search-forward
-	     (eval-when-compile
-	       (let ((s0 "[\t\n ]*")
-		     (s1 "[\t\n ]+"))
-		 (concat "<p" s1 "class" s0 "=" s0 "\"day\"" s0 ">" s0
-			 ;; 1. year
-			 "\\(20[0-9][0-9]\\)年"
-			 ;; 2. month
-			 "\\([01]?[0-9]\\)月"
-			 ;; 3. day
-			 "\\([0-3]?[0-9]\\)日"
-			 ;; 4. hour
-			 "\\([012]?[0-9]\\)時"
-			 ;; 5. minute
-			 "\\([0-5]?[0-9]\\)分"
-			 s0 "</p>")))
-	     nil t)
-	(shimbun-header-set-date
-	 header
-	 (shimbun-make-date-string
-	  (string-to-number (match-string 1))
-	  (string-to-number (match-string 2))
-	  (string-to-number (match-string 3))
-	  (concat (match-string 4) ":" (match-string 5))
-	  "+0900"))))))
-  (goto-char (point-min)))
+	    (if (= retry 1)
+		(setq retry nil)
+	      (setq url "http://www.asahi.com/paper/column.html"
+		    retry 1
+		    start nil)
+	      (shimbun-header-set-xref header url)
+	      (shimbun-fetch-url shimbun url)
+	      (goto-char (point-min)))))))
+     ((string-match "\\`book\\(?:\\.\\|\\'\\)" group)
+      (while (re-search-forward "\\(<a[\t\n ]+[^>]+>\\)\
+\[\t\n ]*<img[\t\n ]+[^>]+>[\t\n ]*</a>"
+				nil t)
+	(when (save-match-data
+		(search-backward "alt=\"No image\"" (match-beginning 0) t))
+	  (replace-match "\\1No image</a>"))))
+     ((string-match "\\`shopping\\." group)
+      (when (re-search-forward "\
+<!-+[\t\n ]*end[\t\n ]+of[\t\n ]+headline[\t\n ]*-+>[\t\n ]*\
+<p[\t\n ]+class=[^>]+>[\t\n ]*\\([^<]+\\)</p>[\t\n ]*\
+<p[\t\n ]+id=\"date\">[\t\n ]*20[0-9][0-9]年[01]?[0-9]月[0-3]*[0-9]日[\t\n ]*\
+</p>[\t\n ]*"
+			       nil t)
+	(replace-match "<!-- Start of Kiji -->\\1<br>\n")))
+     ((string-match "ののちゃんのＤＯ科学" from)
+      ;; Remove furigana.
+      (while (re-search-forward "\\(\\cj\\)（\\cH+）" nil t)
+	(replace-match "\\1")))
+     ((string-match "ゆるゆるフェミニン" from)
+      (let (comics)
+	(while (re-search-forward
+		"<img[\t\n ]+src=\"[^>]+alt=\"マンガ\"[^>]*>"
+		nil t)
+	  (push (match-string 0) comics))
+	(erase-buffer)
+	(when comics
+	  (insert "<!-- Start of Kiji -->\n"
+		  (mapconcat 'identity comics "<br>\n")
+		  "\n<!-- End of Kiji -->\n"))))
+     ((string-match "船橋洋一の世界ブリーフィング" from)
+      (when (re-search-forward "\
+<img[\t\n ]+src=\"[^>]+[\t\n ]+alt=\"船橋洋一顔写真\">"
+			       nil t)
+	(goto-char (match-beginning 0))
+	(insert "<!-- Start of Kiji -->")
+	(when (re-search-forward "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+\\(?:<TD[\t\n ]+id=\"sidebar\">\
+\\|<a[\t\n ]+href=\"http://opendoors\\.asahi\\.com/data/detail/\
+\\|<!-+[\t\n ]*トピックス[\t\n ]*-+>\\)"
+				 nil t)
+	  (goto-char (match-beginning 0))
+	  (insert "\n<!-- End of Kiji -->"))))
+     ((string-match "中国特集" from)
+      (let (start)
+	(when (and (re-search-forward "\
+<H2>中国最新ニュース</H2>[\t\n ]*<H1>[^>]+</H1>[\t\n ]*"
+				      nil t)
+		   (progn
+		     (setq start (match-end 0))
+		     (re-search-forward "\
+<p[^>]*>[\t\n ]*([01][0-9]/[0-3][0-9])[\t\n ]*</p>"
+					nil t)))
+	  (delete-region (match-end 0) (point-max))
+	  (insert "\n<!-- End of Kiji -->")
+	  (delete-region (point-min) (goto-char start))
+	  (insert "<!-- Start of Kiji -->\n"))))
+     ((string-match "東洋経済ニュース" from)
+      ;; Insert newlines.
+      (shimbun-with-narrowed-article
+       shimbun
+       (while (re-search-forward "。　?\\(\\cj\\)" nil t)
+	 (replace-match "。<br><br>　\\1"))))
+     ((string-match "藤沢周平の世界\\|人間国宝" from)
+      (when (re-search-forward "\
+<div[\t\n ]+\\(?:class=\"kiji\"\\|id=\"kokuhou-waza\"\\)>[\t\n ]*"
+			       nil t)
+	(insert "\n<!-- Start of Kiji -->\n")
+	(when (re-search-forward "\
+\\(?:[\t\n ]*<[^>]+>\\)?\\(?:[\t\n ]*20[0-9][0-9]年[01]?[0-9]月[0-3]?[0-9]日\
+\\(?:[\t\n ]*<[^>]+>\\)*\\)?[\t\n ]*<!-+[\t\n ]*google"
+				 nil t)
+	  (goto-char (match-beginning 0))
+	  (insert "\n<!-- End of Kiji -->\n")))))
+    (shimbun-with-narrowed-article
+     shimbun
+     ;; Remove sitesearch area.
+     (when (re-search-forward "[\t\n ]*\\(?:<div[\t\n ]+[^>]+>[\t\n ]*\\)+\
+この記事の関連情報をアサヒ・コム内で検索する"
+			      nil t)
+       (goto-char (match-beginning 0))
+       (insert "\n<!-- End of Kiji -->"))
+     ;; Remove ads.
+     (goto-char (point-min))
+     (when (re-search-forward "[\t\n ]*<p[\t\n ]+class=\"hide\">[\t\n ]\
+*ここから広告です[\t\n ]*</p>"
+			      nil t)
+       (let ((start (match-beginning 0)))
+	 (when (re-search-forward "<p[\t\n ]+class=\"hide\">[\t\n ]*\
+広告終わり\\(?:[\t\n ]*</p>[\t\n ]*\\|\\'\\)"
+				  nil t)
+	   (delete-region start (match-end 0)))))
+     ;; Remove trailing garbage.
+     (goto-char (point-min))
+     (when (and (not (string-match "ゆるゆるフェミニン" from))
+		(re-search-forward
+		 "\\(?:</p>\\)?\\(\\(?:[\t\n 　]*<[^>]+>\\)+[\t\n 　]*\\'\\)"
+		 nil t))
+       (goto-char (match-beginning 0))
+       (while (or (and (looking-at "[\t\n 　]*\\(</[^>]+>\\)[\t\n 　]*")
+		       ;; Don't remove close tags.
+		       (progn (replace-match "\\1") t))
+		  (and (looking-at "[\t\n 　]*<[^>]+>[\t\n 　]*\\|[\t\n 　]+")
+		       (progn (replace-match "") t))))
+       (goto-char (point-max))
+       (unless (bolp) (insert "\n"))))))
 
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-asahi)
 						   header)
   (shimbun-asahi-prepare-article shimbun header))
 
+(defun shimbun-asahi-clear-contents (shimbun header)
+  (when (luna-call-next-method)
+    ;; Remove garbage after an article.
+    (goto-char (point-min))
+    (when (re-search-forward
+	   "[\t\n ]*<!-+[\t\n ]*main[\t\n ]+text[\t\n ]+end[\t\n ]*-+>"
+	   nil t)
+      (delete-region (match-beginning 0) (point-max))
+      (goto-char (point-min)))
+    ;; Remove forms and links.
+    (while (re-search-forward "[\t\n ]*\\(?:<\\(form\\)[\t\n ]\
+\\|<\\(div\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"Box2\"\\)" nil t)
+      (if (shimbun-end-of-tag (or (match-string 1) (match-string 2)) t)
+	  (delete-region (match-beginning 0) (match-end 0))
+	(delete-region (match-beginning 0) (point-max)))
+      (insert "\n"))
+    ;; Extract images in tables.
+    (let (imgs)
+      (while (re-search-forward "<table[\t\n ]" nil t)
+	(setq imgs nil)
+	(when (shimbun-end-of-tag "table" t)
+	  (save-restriction
+	    (narrow-to-region (goto-char (match-beginning 0)) (match-end 0))
+	    (while (re-search-forward "<img[\t\n ]" nil t)
+	      (when (shimbun-end-of-tag)
+		(push (match-string 0) imgs)))
+	    (delete-region (point-min) (point-max))
+	    (when imgs
+	      (apply 'insert (nreverse imgs))))
+	  (when (looking-at "\
+\\(?:<\\(?:!--\\|div[\t\n ]\\)[^>]+>[\t\n ]*\\)+<p>[\t ]*")
+	    (delete-region (match-beginning 0) (match-end 0))))))
+    ;; Remove zoom buttons.
+    (goto-char (point-min))
+    (while (re-search-forward "[\t\n ]*<img\\(?:[\t\n ]+[^\t\n >]+\\)*\
+\[\t\n ]+class=\"ThmbZoomBtn\"[^>]*>[\t\n ]*"
+			      nil t)
+      (replace-match "\n"))
+    ;; Add line breaks after images that captions or images follow.
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "\\(<img[\t\n ]+[^>]+>\\(?:[\t\n ]*</[^>]+>\\)*\\)[\t\n ]*"
+	    nil t)
+      (when (or (save-match-data
+		  (looking-at "\\(?:<[^\t\n >]+>[\t\n ]*\\)*<img[\t\n ]\
+\\|<small>[^<]+</small>"))
+		(not (eq (char-after) ?<)))
+	(replace-match "\\1<br>\n")))
+    ;; Remove related topics.
+    (goto-char (point-min))
+    (while (re-search-forward "\
+<\\(div\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"LnkRelated\\(?:AsaD\\)?\"\
+\\|<\\(p\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"AsaDLnk\"" nil t)
+      (when (shimbun-end-of-tag (or (match-string 1) (match-string 2)) t)
+	(delete-region (match-beginning 0) (match-end 0))
+	(insert "\n")))
+    (unless (shimbun-prefer-text-plain-internal shimbun)
+      (shimbun-break-long-japanese-lines))
+    t))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-asahi)
+						    header)
+  (shimbun-asahi-clear-contents shimbun header))
+
+(defun shimbun-asahi-multi-clear-contents (shimbun header
+						   has-previous-page
+						   has-next-page)
+  (when (luna-call-next-method)
+    (when has-previous-page
+      (goto-char (point-min))
+      (insert "&#012;\n")
+      (when (looking-at "[\t\n ]*<p>[\t\n ]*")
+	(delete-region (match-beginning 0) (match-end 0))))
+    t))
+
+(luna-define-method shimbun-multi-clear-contents :around ((shimbun
+							   shimbun-asahi)
+							  header
+							  has-previous-page
+							  has-next-page)
+  (shimbun-asahi-multi-clear-contents shimbun header
+				      has-previous-page has-next-page))
+
 (provide 'sb-asahi)
 
 ;;; sb-asahi.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-atmarkit.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-atmarkit.el
--- work/emacs-w3m-1.4.4/shimbun/sb-atmarkit.el	2005-03-10 06:51:09.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-atmarkit.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-atmarkit.el --- shimbun backend for atmarkit -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010
+;; NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -19,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -29,10 +30,10 @@
 
 (require 'shimbun)
 (require 'sb-rss)
+(require 'sb-multi)
 
-(luna-define-class shimbun-atmarkit (shimbun-rss) ())
+(luna-define-class shimbun-atmarkit (shimbun-multi shimbun-rss) ())
 
-(defvar shimbun-atmarkit-from-address  "info@atmarkit.co.jp")
 (defvar shimbun-atmarkit-coding-system 'euc-japan)
 (defvar shimbun-atmarkit-content-start "<body[^>]*>")
 (defvar shimbun-atmarkit-content-end "</body[^>]*>")
@@ -41,7 +42,6 @@
   '( ;; ニュース系
     ;; NewsInsight
     ("news". "http://www.atmarkit.co.jp/rss/news/rss2dc.xml")
-
     ;; フォーラム系
     ;; Windows Server Insiderフォーラム
     ("fwin2k" . "http://www.atmarkit.co.jp/rss/fwin2k/rss2dc.xml")
@@ -80,36 +80,51 @@
   (cdr (assoc (shimbun-current-group-internal shimbun)
 	      shimbun-atmarkit-group-path-alist)))
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-atmarkit) url date)
-  (unless (string-match "http://[^\/]+/\\(.+\\)\\.html" url)
-    (error "Cannot find message-id base"))
-  (format "<%s%%%s@atmarkit.co.jp>" (match-string-no-properties 1 url)
-	  (shimbun-current-group-internal shimbun)))
-
-(defvar shimbun-atmarkit-use-base-url nil
-  "Non-nil means make `shimbun-article-url' return a base url.")
-
-(luna-define-method shimbun-article-url :around ((shimbun shimbun-atmarkit)
-						 header)
-  ;; Switch the return value to the base url and the printing url
-  ;; according to `shimbun-atmarkit-use-base-url'.
-  (if shimbun-atmarkit-use-base-url
-      (luna-call-next-method)
-    "http://www.atmarkit.co.jp/club/print/print.php"))
-
-(luna-define-method shimbun-make-contents :around ((shimbun shimbun-atmarkit)
-						   header)
-  ;; Make `shimbun-article-url' return the base url rather than the
-  ;; printing url because links in the print page are relative to it.
-  (let ((shimbun-atmarkit-use-base-url t))
-    (luna-call-next-method)))
+(luna-define-method shimbun-article-url ((shimbun shimbun-atmarkit)
+					 header)
+  "http://www.atmarkit.co.jp/club/print/print.php")
+
+(luna-define-method shimbun-get-headers :around ((shimbun shimbun-atmarkit)
+						 &optional range)
+  (mapcar
+   (lambda (header)
+     (shimbun-header-set-xref header
+			      (shimbun-real-url (shimbun-header-xref header)))
+     header)
+   (luna-call-next-method)))
+
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-atmarkit)
+					    header url)
+  (goto-char (point-max))
+  (when (re-search-backward
+	 "<a href=\"\\([^\"]+\\)\"><img src=\"[^\"]*/images/next\\.gif\"" nil t)
+    (shimbun-expand-url (match-string 1) url)))
+
+(luna-define-method shimbun-multi-clear-contents ((shimbun shimbun-atmarkit)
+						  header
+						  has-previous-page
+						  has-next-page)
+  (when (shimbun-clear-contents shimbun header)
+    (when has-next-page
+      ;; Remove footer.
+      (goto-char (point-min))
+      (when (re-search-forward
+	     "<img src=\"[^\"]*/images/\\(prev\\|next\\)\\.gif\"" nil t)
+	(delete-region (line-beginning-position) (point-max))
+	(insert "</tr></table>")))
+    t))
 
 (luna-define-method shimbun-clear-contents :before ((shimbun shimbun-atmarkit)
 						    header)
-  (shimbun-remove-tags "<script" "</script *>")
-  (shimbun-remove-tags "<noscript" "</noscript *>")
-  (shimbun-remove-tags "<form" "</form *>"))
+  (shimbun-remove-tags "script\\|noscript\\|form" t))
+
+(luna-define-method shimbun-article :before ((shimbun shimbun-atmarkit)
+					     header &optional outbuf)
+  (let ((xref (shimbun-header-xref header))
+	end)
+    (when (setq end (string-match "\\?" xref))
+      (setq xref (substring xref 0 end)))
+    (shimbun-header-set-xref header xref)))
 
 (provide 'sb-atmarkit)
 
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-atom-hash.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-atom.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-bbc.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-bbc.el
--- work/emacs-w3m-1.4.4/shimbun/sb-bbc.el	2005-03-16 13:27:21.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-bbc.el	2007-11-02 20:11:24.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-bbc.el --- shimbun backend for BBC UK
 
-;; Copyright (C) 2003, 2004, 2005 Koichiro Ohba <koichiro@meadowy.org>
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007
+;; Koichiro Ohba <koichiro@meadowy.org>
 
 ;; Author: Koichiro Ohba <koichiro@meadowy.org>
 ;; Keywords: news
@@ -19,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -33,25 +34,50 @@
 (luna-define-class shimbun-bbc (shimbun-rss) ())
 
 (defvar shimbun-bbc-url
-  "http://news.bbc.co.uk/rss/newsonline_uk_edition/world/rss091.xml")
-(defvar shimbun-bbc-groups '("news"))
+  "http://newsrss.bbc.co.uk/rss/newsonline_uk_edition")
 (defvar shimbun-bbc-from-address  "newsonline@bbc.co.uk")
 (defvar shimbun-bbc-content-start
-  "\\(<!-- \\(E I\\(BYL\\|IMA\\)\\|S I\\(BOX\\|IMA\\)\\) -->\\)")
+  (concat "<!-- "
+	  (regexp-opt '("E IBYL" "E IIMA" "S IBOX" "S IMA" "S BO"))
+	  " -->"))
 (defvar shimbun-bbc-content-end "<!-- E BO -->")
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-bbc) url date)
-;;;<DEBUG>
-;;  (shimbun-bbc-build-message-id url))
-;;
-;;(defun shimbun-bbc-build-message-id (url)
-;;;</DEBUG>
-  (if (string-match "/hi/\\(.+\\)\\.stm" url)
-      (let ((elems (nreverse (split-string (match-string 1 url) "/"))))
-	(concat "<" (car elems) "@" (mapconcat 'identity (cdr elems) ".")
-		".bbc.co.uk>"))
-    (error "Cannot find message-id base")))
+(defvar shimbun-bbc-path-alist
+  '(("front_page" . "/front_page/rss.xml")
+    ;; use the name "news" here to be backward compatible
+    ;; ("world" . "/world/rss.xml")
+    ("news" . "/world/rss.xml")
+    ("uk" . "/uk/rss.xml")
+    ("england" . "/england/rss.xml")
+    ("northern_ireland" . "/northern_ireland/rss.xml")
+    ("scotland" . "/scotland/rss.xml")
+    ("wales" . "/wales/rss.xml")
+    ("business" . "/business/rss.xml")
+    ("politics" . "/uk_politics/rss.xml")
+    ("health" . "/health/rss.xml")
+    ("education" . "/education/rss.xml")
+    ("science" . "/sci/tech/rss.xml")
+    ("technology" . "/technology/rss.xml")
+    ("entertainment" . "/entertainment/rss.xml")
+    ("talking_point" . "/talking_point/rss.xml")
+    ("magazine" . "/magazine/rss.xml")
+    ("week_at-a-glance" . "/week_at-a-glance/rss.xml")
+    ("programmes" . "programmes/rss.xml")
+    ("latest_stories" . "/latest_published_stories/rss.xml")))
+
+(defvar shimbun-bbc-x-face-alist
+  '(("default" . "\
+Face: iVBORw0KGgoAAAANSUhEUgAAACoAAAAOAgMAAAAkkGboAAAADFBMVEW7uLJ/e2z////09PP
+ b5J9PAAAAjElEQVQI12OYGhqaGRoaBqQSGLJWrZq2atVKIDWBIev/qmnrf63M2v8KyBatmrYwfGW
+ WaByQLeM1beGRlRn+h4BsqahpC5euzNUCqRcEqhFfmfgKxBaIm7aQ9SWELXVp2sK1molgNfJC0xZ
+ +1IToFfWbtjDkZbZoEJB9/tW0Nf9WZm34NQHFDaEItwEAmSVN3A2XO9kAAAAASUVORK5CYII=")))
+
+(defvar shimbun-bbc-groups (mapcar 'car shimbun-bbc-path-alist))
+
+(luna-define-method shimbun-index-url ((shimbun shimbun-bbc))
+  (concat shimbun-bbc-url
+	  (cdr (assoc (shimbun-current-group-internal shimbun)
+		      shimbun-bbc-path-alist))))
 
 (provide 'sb-bbc)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-bbdb-ml.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-bbdb-ml.el
--- work/emacs-w3m-1.4.4/shimbun/sb-bbdb-ml.el	2005-03-08 10:29:12.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-bbdb-ml.el	2007-10-17 20:15:58.000000000 +0900
@@ -20,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-cgi-board.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cgi-board.el
--- work/emacs-w3m-1.4.4/shimbun/sb-cgi-board.el	2004-08-05 12:16:23.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cgi-board.el	2009-09-18 08:39:40.000000000 +0900
@@ -16,9 +16,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -29,7 +29,13 @@
 
 (require 'shimbun)
 (eval-when-compile
-  (require 'cl))
+  (require 'cl)
+  ;; `multiple-value-bind' requires the 2nd argument to be multiple-value,
+  ;; not a list, in particular for XEmacs 21.5.  `values-list' does it,
+  ;; but is a run-time cl function in XEmacs 21.4 and Emacs 21.
+  (when (eq 'identity (symbol-function 'values-list))
+    (define-compiler-macro values-list (arg)
+      arg)))
 
 (defcustom shimbun-cgi-board-group-alist
   '(("support" .
@@ -149,7 +155,7 @@
 				  (string-to-number (match-string 3 string))
 				  (match-string 4 string))
       (multiple-value-bind (sec min hour day month year dow dst zone)
-	  (decode-time (shimbun-time-parse-string string))
+	  (values-list (decode-time (shimbun-time-parse-string string)))
 	(setq zone (/ zone 60))
 	(shimbun-make-date-string year month day
 				  (format "%02d:%02d" hour min)
@@ -182,7 +188,7 @@
 	      (string-match "\\`[^:/#?]+://\\([^/#?]+\\)/" url)
 	      (match-string 1 url)))))
 
-(luna-define-method shimbun-make-contents ((shimbun shimbun-cgi-board) header)
+(luna-define-method shimbun-clear-contents ((shimbun shimbun-cgi-board) header)
   (let ((id (shimbun-header-id header)))
     (when (string-match "\\`<\\([^@]+\\)@" id)
       (goto-char (point-min))
@@ -196,15 +202,7 @@
 	  (goto-char (point-min))
 	  (when (looking-at "<hr[^>]*>")
 	    (delete-region (match-beginning 0) (match-end 0)))
-	  (goto-char (point-min))
-	  (insert "<html>\n<head>\n<base href=\""
-		  (shimbun-header-xref header)
-		  "\">\n</head>\n<body>\n")
-	  (goto-char (point-max))
-	  (insert (shimbun-footer shimbun header t)
-		  "\n</body>\n</html>\n")
-	  (shimbun-make-mime-article shimbun header)
-	  (buffer-string))))))
+	  t)))))
 
 (provide 'sb-cgi-board)
 
Only in work/emacs-w3m-1.4.4/shimbun: sb-chalow.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-chise.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-cnet-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnet-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-cnet-jp.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnet-jp.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,11 +1,12 @@
 ;;; sb-cnet-jp.el --- shimbun backend for CNET Japan -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010
+;; NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio     <minakaji@namazu.org>,
 ;;         TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;         Katsumi Yamaoka    <yamaoka@jpl.org>,
-;;         Tsuyoshi CHO       <mfalcon_sky@emailuser.net>
+;;         Tsuyoshi CHO       <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 ;; Created: Jun 14, 2003
 
@@ -22,38 +23,53 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
+(require 'sb-multi)
 (require 'sb-rss)
 
-(luna-define-class shimbun-cnet-jp (shimbun-japanese-newspaper shimbun-rss) ())
+(luna-define-class shimbun-cnet-jp (shimbun-multi shimbun-rss) ())
 
 (defvar shimbun-cnet-jp-group-alist
-  '(("news"	     . "http://japan.cnet.com/rss/index.rdf")
-    ("blog.kenn"     . "http://blog.japan.cnet.com/kenn/index.rdf")
-    ("blog.lessig"   . "http://blog.japan.cnet.com/lessig/index.rdf")
-    ("blog.watanabe" . "http://blog.japan.cnet.com/watanabe/index.rdf")
-    ("blog.editors"  . "http://blog.japan.cnet.com/editors/index.rdf")))
+  '(("general" . "http://feed.japan.cnet.com/rss/index.rdf")
+    ("news" . "http://feed.japan.cnet.com/rss/news/index.rdf")
+    ;;("release" . "http://release.japan.cnet.com/rss/index.rdf")
+    ("special" . "http://feed.japan.cnet.com/rss/sp/index.rdf")
+    ("opinion" . "http://feed.japan.cnet.com/rss/opinion/index.rdf")
+    ;;("whitepaper" . "http://paper.japan.cnet.com/rss/index.rdf")
+    ;;("review" . "http://review.japan.cnet.com/rss/index.rdf")
+    ("blog.geetstate" . "http://blog.japan.cnet.com/geetstate/index.rdf")
+    ("blog.kenn" . "http://blog.japan.cnet.com/kenn/index.rdf")
+    ("blog.lessig" . "http://blog.japan.cnet.com/lessig/index.rdf")
+    ("blog.matsumura" . "http://blog.japan.cnet.com/matsumura/index.rdf")
+    ("blog.nakajima" . "http://blog.japan.cnet.com/nakajima/index.rdf")
+    ("blog.saeki" . "http://blog.japan.cnet.com/saeki/index.rdf")
+    ("blog.sakamoto" . "http://blog.japan.cnet.com/sakamoto/index.rdf")
+    ("blog.sasaki" . "http://blog.japan.cnet.com/sasaki/index.rdf")
+    ("blog.sentan" . "http://blog.japan.cnet.com/sentan/index.rdf")
+    ("blog.staff" . "http://blog.japan.cnet.com/staff/index.rdf")
+    ("blog.takawata" . "http://blog.japan.cnet.com/takawata/index.rdf")
+    ("blog.watanabe" . "http://blog.japan.cnet.com/watanabe/index.rdf")))
 
 (defvar shimbun-cnet-jp-orphaned-group-list
   '("blog.inoue"
     "blog.mori"
-    "blog.umeda"))
+    "blog.umeda"
+    "blog.editors"))
 
-(defvar shimbun-cnet-jp-server-name "CNET Japan")
-(defvar shimbun-cnet-jp-from-address  "webmaster@japan.cnet.com")
-(defvar shimbun-cnet-jp-content-start "<div class=\"leaf_body\">")
-(defvar shimbun-cnet-jp-content-end "<!--NEWS LETTER SUB-->")
+(defvar shimbun-cnet-jp-server-name "CNET Networks,Inc.")
+(defvar shimbun-cnet-jp-content-start
+  "<div class=\"\\(?:leaf\\|article\\)_body\\(?: \\(?:article\\|leaf\\)_body\\)?\">")
+(defvar shimbun-cnet-jp-content-end
+  "\\(<div \\(class=\"article_footer\"\\|id=\"bubble_tooltip\"\\)>\\|\
+<!--h3>トラックバック一覧</h3-->\\)")
 (defvar shimbun-cnet-jp-x-face-alist
   '(("default" . "X-Face: 0p7.+XId>z%:!$ahe?x%+AEm37Abvn]n\
 *GGh+>v=;[3`a{1lqO[$,~3C3xU_ri>[JwJ!9l0\n ~Y`b*eXAQ:*q=bBI\
@@ -72,119 +88,48 @@
 (luna-define-method shimbun-index-url ((shimbun shimbun-cnet-jp))
   (cdr (assoc (shimbun-current-group shimbun) shimbun-cnet-jp-group-alist)))
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-cnet-jp) url date)
-  (if (or
-       ;; For news group
-       (string-match "http://japan\\.cnet\\.com/\
-\\(.+\\)/\\([,0-9]+\\)\\.htm\\?ref=rss" url)
-       ;; For blog group
-       (string-match "http://blog\\.japan\\.cnet\\.com/\
-\\([^/]+\\)/archives/\\([0-9]+\\)\\.html" url))
-      (concat "<"
-	      (shimbun-replace-in-string
-	       (match-string-no-properties 2 url) "," ".")
-	      "%" (shimbun-current-group shimbun) "@japan.cnet.com>")
-    (error "Cannot find message-id base")))
-
-(defun shimbun-cnet-jp-clean-text-page ()
-  (let ((case-fold-search t) (start))
-    (goto-char (point-min))
-    (when (and (search-forward shimbun-cnet-jp-content-start nil t)
-	       (setq start (match-end 0))
-	       (re-search-forward shimbun-cnet-jp-content-end nil t))
-      (delete-region (match-beginning 0) (point-max))
-      (delete-region (point-min) start)
-      (goto-char (point-min))
-      )))
-
-(defun shimbun-cnet-jp-retrieve-next-pages (shimbun header base-cid url
-						    &optional images)
-  (let ((case-fold-search t) (next))
-    (goto-char (point-min))
-    (when (re-search-forward
-	   "<a +href=\"\\([^\"]*\\)\"[^>]*>次のページ" nil t)
-      (setq next (shimbun-expand-url (match-string 1) url)))
-    (shimbun-cnet-jp-clean-text-page)
-    (goto-char (point-min))
-    ;; remove page footer (last page is ignored)
-    (when (re-search-forward "| [0-9]+ / [0-9]+ |" nil t)
-      (if next
-	  ;; isn't last
-	  (progn
-	    (goto-char (match-end 0))
-	    ;; "<a href...>前の..." or "| 1 "
-	    (re-search-backward "\\(<a\\|| 1 \\)" nil t)
-	    (delete-region (match-beginning 0) (point-max)))
-	;; last page
-	(let ((end (match-end 0)))
-	  (goto-char end)
-	  (re-search-backward "<a" nil t) ;; "<a href...>前の..."
-	  (delete-region (match-beginning 0) end))))
-    (goto-char (point-min))
-    (insert "<html>\n<head>\n<base href=\"" url "\">\n</head>\n<body>\n")
-    (goto-char (point-max))
-    (unless next
-      (insert (shimbun-footer shimbun header t)))
-    (insert "\n</body>\n</html>\n")
-    (when shimbun-encapsulate-images
-      (setq images (shimbun-mime-replace-image-tags base-cid url images)))
-    (let ((body (shimbun-make-text-entity "text/html" (buffer-string)))
-	  (result (when next
-		    (with-temp-buffer
-		      (shimbun-fetch-url shimbun next)
-		      (shimbun-clear-contents shimbun header)
-		      (shimbun-cnet-jp-retrieve-next-pages
-		       shimbun header base-cid next images)))))
-      (list (cons body (car result))
-	    (or (nth 1 result) images)))))
-
-(luna-define-method shimbun-make-contents ((shimbun shimbun-cnet-jp) header)
-  (let ((case-fold-search t))
-    (shimbun-clear-contents shimbun header)
-    (let ((base-cid (shimbun-header-id header)))
-      (when (string-match "\\`<\\([^>]+\\)>\\'" base-cid)
-	(setq base-cid (match-string 1 base-cid)))
-      (let (body)
-	(multiple-value-bind (texts images)
-	    (shimbun-cnet-jp-retrieve-next-pages shimbun header base-cid
-						 (shimbun-header-xref header))
-	  (erase-buffer)
-	  (if (= (length texts) 1)
-	      (setq body (car texts))
-	    (setq body (shimbun-make-multipart-entity))
-	    (let ((i 0))
-	      (dolist (text texts)
-		(setf (shimbun-entity-cid text)
-		      (format "shimbun.%d.%s" (incf i) base-cid))))
-	    (apply 'shimbun-entity-add-child body texts))
-	  (when images
-	    (setf (shimbun-entity-cid body) (concat "shimbun.0." base-cid))
-	    (let ((new (shimbun-make-multipart-entity)))
-	      (shimbun-entity-add-child new body)
-	      (apply 'shimbun-entity-add-child new
-		     (mapcar 'cdr (nreverse images)))
-	      (setq body new))))
-	(shimbun-header-insert shimbun header)
-	(insert "MIME-Version: 1.0\n")
-	(shimbun-entity-insert body)))
-    (buffer-string)))
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-cnet-jp)
+					    header url)
+  (goto-char (point-min))
+  (when (re-search-forward "<li class=\"next\"><a href=\"\\([^\"]+\\)\"" nil t)
+    (shimbun-expand-url (match-string 1) url)))
 
-(luna-define-method shimbun-clear-contents :before
-  ((shimbun shimbun-cnet-jp) header)
+(luna-define-method shimbun-clear-contents :before ((shimbun shimbun-cnet-jp)
+						    header)
   (shimbun-strip-cr)
-  ;; remove advertisement <div class="ad.*"> - </div>
-  (shimbun-remove-tags "<div +class=\"?ad" "</div>")
-  ;; remove column <div class="pall5( bd1)"> - </div>
-  (shimbun-remove-tags "<div +class=\"?pall5" "</div>")
-  (shimbun-remove-tags "<script" "</script>")
-  (shimbun-remove-tags "<noscript" "</noscript>"))
-
-(luna-define-method shimbun-footer :around ((shimbun shimbun-cnet-jp) header
-					    &optional html)
-  (if (string= "news" (shimbun-current-group shimbun))
-      (luna-call-next-method)
-    ""))
+  (shimbun-remove-tags "script\\|noscript" t)
+  (shimbun-remove-tags
+   "\\(div\\) class=\"\\(?:photor_thumb_wrap\\|block_infocnet_stb\\)\"" t)
+  (shimbun-remove-tags "<div class=\"block_ad_print\">"
+		       "<!-- block_ad_print END -->")
+  (shimbun-remove-tags "<!--AD_ART_S-->" "<!--AD_ART_S END-->"))
+
+(luna-define-method shimbun-multi-clear-contents ((shimbun shimbun-cnet-jp)
+						  header
+						  has-previous-page
+						  has-next-page)
+  (when (shimbun-clear-contents shimbun header)
+    (cond
+     (has-next-page
+      (goto-char (point-max))
+      (when (search-backward "<div class=\"navi_paging_alt\">" nil t)
+	(delete-region (point) (point-max))))
+     (has-previous-page
+      (shimbun-remove-tags "<div class=\"navi_paging_alt\">"
+			   "<!-- navi_paging_alt END -->")))
+    t))
+
+(luna-define-method shimbun-make-contents :before ((shimbun shimbun-cnet-jp)
+						   header)
+  (goto-char (point-min))
+  (when (re-search-forward "\\(s.prop2=\"\\([^\"]+\\)\"\\|\
+<dt +class=\"author\">\\([^\n]+\\)</dt>\\)" nil t)
+    (let ((from (or (match-string 2) (match-string 3))))
+      (setq from (shimbun-replace-in-string from "文：" ""))
+      (setq from (shimbun-replace-in-string from "翻訳校正：*" ""))
+      (setq from (shimbun-replace-in-string from " *<br */?> *" ", "))
+      (setq from (shimbun-replace-in-string from "、" ", "))
+      (shimbun-header-set-from header from))))
 
 (provide 'sb-cnet-jp)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-cnet.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnet.el
--- work/emacs-w3m-1.4.4/shimbun/sb-cnet.el	2004-01-12 22:47:30.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnet.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-cnet.el --- shimbun backend for CNET
 
-;; Copyright (C) 2004 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2004, 2006, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;         Yuuichi Teranishi  <teranisi@gohome.org>,
@@ -20,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -40,7 +41,13 @@
 (require 'shimbun)
 (require 'sb-rss)
 (eval-when-compile
-  (require 'cl))
+  (require 'cl)
+  ;; `multiple-value-bind' requires the 2nd argument to be multiple-value,
+  ;; not a list, in particular for XEmacs 21.5.  `values-list' does it,
+  ;; but is a run-time cl function in XEmacs 21.4 and Emacs 21.
+  (when (eq 'identity (symbol-function 'values-list))
+    (define-compiler-macro values-list (arg)
+      arg)))
 
 (luna-define-class shimbun-cnet (shimbun-rss shimbun) ())
 
@@ -72,7 +79,7 @@
 (luna-define-method shimbun-rss-process-date ((shimbun shimbun-cnet) string)
   "Convert a slightly corrupted date string to a date string in right format."
   (multiple-value-bind (sec min hour day month year dow dst zone)
-      (decode-time (shimbun-time-parse-string string))
+      (values-list (decode-time (shimbun-time-parse-string string)))
     (setq zone (/ zone 60))
     (shimbun-make-date-string year month day
 			      (format "%02d:%02d" hour min)
@@ -81,13 +88,6 @@
 				      (/ zone 60)
 				      (% zone 60)))))
 
-(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-cnet)
-						  url date)
-  (if (string-match "\\`http://news\\.com\\.com/\\([-_0-9]+\\)\\.html" url)
-      (concat "<" (match-string 1 url) "%"
-	      (shimbun-current-group shimbun) "@news.com.com>")
-    (error "Cannot find message-id base")))
-
 (defun shimbun-cnet-extract-body ()
   "Extract a body of an article.
 In CNET site, bodies are surrounded by either <div id=\"story\"> or
@@ -125,13 +125,12 @@
       (insert "</div>\n"))))
 
 (defun shimbun-cnet-remove-useless-tags ()
-  (shimbun-remove-tags "<script" "</script>")
-  (shimbun-remove-tags "<noscript" "</noscript>")
-  (shimbun-remove-tags "<a href=\"[^\"]+\\?tag=st_util_print\">" "</a>")
-  (shimbun-remove-tags "<a href=\"[^\"]+\\?tag=st_util_email\">" "</a>")
-  (shimbun-remove-tags "<a onclick" "</a>")
-  (shimbun-remove-tags "<a href=\"javascript" "</a>")
-  (shimbun-remove-tags "<newselement type=\"table\">" "</newselement>"))
+  (shimbun-remove-tags "script\\|noscript" t)
+  (shimbun-remove-tags "\\(a\\) \\(?:\
+\\(?:href=\"\\(?:[^\"]+\\?tag=st_util_print\"\\|[^\"]+\\?tag=st_util_email\"\
+javascript\\)\\)\
+\\|onclick\\)" t)
+  (shimbun-remove-tags "\\(newselement\\) type=\"table\"" t))
 
 (luna-define-method shimbun-clear-contents ((shimbun shimbun-cnet) header)
   (shimbun-strip-cr)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-cnn-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnn-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-cnn-jp.el	2005-03-14 07:25:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-cnn-jp.el	2008-03-28 14:24:31.000000000 +0900
@@ -1,8 +1,8 @@
-;;; sb-cnn-jp.el --- shimbun backend for CNN Japan -*- coding: iso-2022-7bit; -*-
+;;; sb-cnn-jp.el --- shimbun backend for CNN Japan
 
-;; Copyright (C) 2003, 2004, 2005 Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Copyright (C) 2003, 2004, 2005, 2008 Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
-;; Author: Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Author: Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 ;; Created: May 22, 2004
 
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -40,8 +40,11 @@
 (defvar shimbun-cnn-jp-server-name "CNN Japan")
 (defvar shimbun-cnn-jp-from-address "webmaster@cnn.co.jp")
 (defvar shimbun-cnn-jp-content-start
-  "Web\\(\\s \\|&nbsp;\\)+posted\\(\\s \\|&nbsp;\\)+at:[^<]*<br>")
-(defvar shimbun-cnn-jp-content-end "<div class=\"box\">")
+  "<div[\t\n ]+class=\"topPhImg\">[\t\n ]*\
+\\|<div[\t\n ]class=\"topArtBox\">[\t\n ]*\
+\\|Web\\(?:\\s \\|&nbsp;\\)+posted\\(?:\\s \\|&nbsp;\\)+at:[^<]*<br>")
+(defvar shimbun-cnn-jp-content-end
+  "[\t\n ]*<div class=\"\\(?:txtPR\\|box\\)\">")
 (defvar shimbun-cnn-jp-expiration-days 14)
 
 (defvar shimbun-cnn-jp-group-alist
@@ -56,14 +59,11 @@
 
 (defvar shimbun-cnn-jp-x-face-alist
   '(("default" . "\
-Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAWAgMAAAD7mfc/AAAABGdBTUEAALGPC/xhBQAAAAx
- QTFRFtgEB4mlp9bGx/vT0/VCoMAAAAC90RVh0U29mdHdhcmUAWFYgVmVyc2lvbiAzLjEwYStGTG1
- hc2sgIFJldjogMTIvMjkvOTQbx6p8AAAA9ElEQVR42j3OMU7DQBAF0L8TxRviIg1IhCYUES0cYbM
- FNRROJFwQSioq6oxzAgspkTgCziHiI2xD78Y9RZBAsjwZS4hmvl7z/0Da+7RO5XchoYQEpJu51Em
- HFme7JJHPZBUYP1TsFvVq832tqMaI568v2/eRolwijp4ftw9WwXyxj8bp2y0pvBOJrF/PWEEkQiZ
- bu/xOYRXIyV1CEXe4Me78H6fGnXTodRgYR/gr6JPxxjEy3gtZmnlm/SDvJ2Q582HJCFNoffnkqyn
- ja+gQ2erKHwYlGlMUH/FhSE3EEAdg1KDXakqlZ9LCii6J5DB7CROp4iPbnmrk8JWgOgAAAAd0SU1
- FB9QGBAQGEAm9iVAAAAAASUVORK5CYII=")))
+Face: iVBORw0KGgoAAAANSUhEUgAAACMAAAAQAgMAAADhWS7JAAAADFBMVEW2AQHojY3xxsb////
+ LZAepAAAAmUlEQVQI12P4P0F86v6v8R8aGH4ySIXmXw3/4MDwQDQqKnraJCCrwYFNLHxqAJDlyBg
+ pGjZVoMCBgYX/r0hAI4sCkKX/l0WAkZEByKr/y8ICYdn/ZWEAMiCyQBZQzJX7L0uAI4uAA0MjAwN
+ LgSMviwPDhQAGlhJRPiDrg2howB4WeUcHhr8MDAz/GOQPMDD8X8LA9r+h/gEHAHPyLQOjNU7WAAA
+ AAElFTkSuQmCC")))
 
 (luna-define-method shimbun-groups ((shimbun shimbun-cnn-jp))
   (mapcar 'car shimbun-cnn-jp-group-alist))
@@ -75,62 +75,64 @@
 (luna-define-method shimbun-get-headers ((shimbun shimbun-cnn-jp)
 					 &optional range)
   (let ((case-fold-search t)
-	(beg (point-min)) (end (point-max))
-	headers)
-    (goto-char (point-min))
-    (when (re-search-forward
-	   "FULL STORY" nil t)
-      (setq beg (match-end 0)))
-    (when (re-search-forward
-	   "<!-- *ＣＮＮ *ラージタイル *[0-9]+\\*[0-9]+ *★? *ここから *-->"
-	   nil t)
-      (setq end (match-beginning 0)))
-    (save-excursion
-      (narrow-to-region beg end)
-      (goto-char (point-min))
-      (let (title url date id str)
-	(while (re-search-forward
-		"<a href=\"\\([^\"]*\\)\">\\([^<]*\\)</a>"
-		nil t)
-	  (setq title (match-string-no-properties 2))
-	  (setq str   (substring (match-string-no-properties 1) 1))
-	  (setq url   (shimbun-expand-url (concat shimbun-cnn-jp-url str)))
-	  (let ((year 0) (month 0) (day 0))
-	    (when (string-match
-		   "\\([^/]*\\)/\\([^0-9]*\\)\\([0-9][0-9][0-9][0-9]\\)\
-\\([0-9][0-9]\\)\\([0-9][0-9]\\)\\([0-9]*\\)"
-		   str)
-	      (setq year  (match-string-no-properties 3 str)
-		    month (match-string-no-properties 4 str)
-		    day   (match-string-no-properties 5 str)))
-	    (setq id (format "<%s%s%s%s%s%%%s@%s>"
-			     (match-string-no-properties 2 str)	; news provider
-			     year month day ; date
-			     (match-string-no-properties 6 str)	; number
-			     (match-string-no-properties 1 str)	; category
-			     shimbun-cnn-jp-top-level-domain)) ; domain
-	    (setq date (shimbun-make-date-string
-			(string-to-int year)
-			(string-to-int month)
-			(string-to-int day)))
-	    (push (shimbun-create-header
-		   0
-		   title
-		   (shimbun-from-address shimbun)
-		   date
-		   id "" 0 0 url)
-		  headers)))))
+	(from (shimbun-from-address shimbun))
+	year month day id ids headers)
+    (while (re-search-forward
+	    (eval-when-compile
+	      (concat "<a href=\"/"
+		      ;; 1. url
+		      "\\("
+		      ;; 2. category
+		      "\\([^/]+\\)"
+		      "/"
+		      ;; 3. news provider
+		      "\\([^./0-9]+\\)"
+		      ;; 4. year
+		      "\\(20[0-9][0-9]\\)"
+		      ;; 5. month
+		      "\\([01][0-9]\\)"
+		      ;; 6. day
+		      "\\([0-3][0-9]\\)"
+		      ;; 7. number
+		      "\\([0-9]+\\)"
+		      "\\.html\\)"
+		      "\">"
+		      ;; 8. title
+		      "\\([^>]+\\)"
+		      "</a>"))
+	    nil t)
+      (setq year (string-to-number (match-string 4))
+	    month (string-to-number (match-string 5))
+	    day (string-to-number (match-string 6))
+	    id (format "<%s%d%02d%02d%s%%%s@%s>"
+		       (match-string 3)
+		       year month day
+		       (match-string 7)
+		       (match-string 2)
+		       shimbun-cnn-jp-top-level-domain))
+      (unless (or (member id ids) ;; Avoid duplications.
+		  (shimbun-search-id shimbun id))
+	(push id ids)
+	(push (shimbun-create-header
+	       0
+	       (match-string 8)
+	       from
+	       (shimbun-make-date-string year month day)
+	       id "" 0 0
+	       (shimbun-expand-url (match-string 1) shimbun-cnn-jp-url))
+	      headers)))
     headers))
 
-;; date normalize
 (defun shimbun-cnn-jp-prepare-article (shimbun header)
-  "Prepare an article: adjusting a date header if there is a correct
-information available."
-  (let ((case-fold-search t))
+  "Prepare an article:
+ adjusting a date header if there is a correct information available;
+ move a photograph to the top."
+  (let ((case-fold-search t)
+	photo)
     (when (re-search-forward
 	   ">\\(20[0-9][0-9]\\).\\([01][0-9]\\).\\([0-3][0-9]\\)<br>\n\
-Web\\(\\s \\|&nbsp;\\)+posted\\(\\s \\|&nbsp;\\)+at:[^0-9]*\
-\\([0-9][0-9]:[0-9][0-9]\\)\\(\\s \\|&nbsp;\\)*\\([A-Z]+\\)<br>"
+Web\\(?:\\s \\|&nbsp;\\)+posted\\(?:\\s \\|&nbsp;\\)+at:[^0-9]*\
+\\([0-9][0-9]:[0-9][0-9]\\)\\(?:\\s \\|&nbsp;\\)*\\([A-Z]+\\)<br>"
 	   ;; <p class="date">2005.02.10<br>
 	   ;; Web&nbsp;posted&nbsp;at:&nbsp;
 	   ;; 10:23
@@ -142,8 +144,29 @@
 	(string-to-number (match-string-no-properties 1))
 	(string-to-number (match-string-no-properties 2))
 	(string-to-number (match-string-no-properties 3))
-	(match-string-no-properties 6)
-	(match-string-no-properties 8)))
+	(match-string-no-properties 4)
+	(match-string-no-properties 5)))
+      (goto-char (point-min)))
+
+    (when (and (not (shimbun-prefer-text-plain-internal shimbun))
+	       (re-search-forward "<div[\t\n ]+class=\"ImgC\">[\t\n ]*\
+\\(<img[\t\n ]+[^>]+>\\)[\t\n ]*</div>\
+\\(?:[\t\n ]*<div[\t\n ]+class=\"pCaption\">[\t\n ]*\
+<p>\\([^<]+\\)</p>[\t\n ]*</div>\\)?"
+				  nil t)
+	       (progn
+		 (setq photo (if (match-beginning 2)
+				 (concat (match-string 1) "<br>\n"
+					 (match-string 2) "<br>\n")
+			       (concat (match-string 1) "<br>\n")))
+		 (goto-char (point-min))
+		 (re-search-forward (shimbun-content-start shimbun) nil t)))
+      (if (looking-at "[\t\n ]*\\(-[\t\n ]+[A-Z]+\\(?:/[A-Z]+\\)*\\)\
+\[\t\n ]*</p>[\t\n ]*<p>")
+	  (replace-match (concat "\\1<br>\n" photo "<p>"))
+	(when (looking-at "[\t\n ]+")
+	  (delete-region (match-beginning 0) (match-end 0)))
+	(insert photo))
       (goto-char (point-min)))))
 
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-cnn-jp)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-coldsync.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-coldsync.el
--- work/emacs-w3m-1.4.4/shimbun/sb-coldsync.el	2005-03-14 07:25:37.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-coldsync.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-debian-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-debian-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-debian-jp.el	2003-12-24 11:58:57.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-debian-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-debian.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-debian.el
--- work/emacs-w3m-1.4.4/shimbun/sb-debian.el	2003-11-18 10:57:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-debian.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-debian.el --- shimbun backend for debian.org
 
-;; Copyright (C) 2001, 2002, 2003 OHASHI Akira <bg66@koka-in.org>
+;; Copyright (C) 2001, 2002, 2003, 2005, 2007 OHASHI Akira <bg66@koka-in.org>
 
 ;; Author: OHASHI Akira <bg66@koka-in.org>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -104,32 +104,32 @@
   (concat (shimbun-current-group-internal shimbun) "@debian.org"))
 
 (defmacro shimbun-debian-get-headers (shimbun url headers &optional aux)
-  (` (let ((case-fold-search t)
-	   (regexp (or (shimbun-mhonarc-litemplate-regexp-internal (, shimbun))
-		       shimbun-mhonarc-litemplate-regexp))
-	   (year (and (string-match (concat (regexp-quote (shimbun-index-url shimbun))
-					    "\\([0-9]+\\)")
-				    url)
-		      (match-string 1 url)))
-	   month day date-start date-end)
-       (goto-char (point-max))
-       (while (and (setq date-end (re-search-backward "^</ul>" nil t))
-		   (setq date-start (re-search-backward "^<ul>" nil t)))
-	 (forward-line -1)
-	 (looking-at "^\\(\\w+\\) \\([0-9]+\\)")
-	 (setq month (match-string 1)
-	       day (match-string 2))
-	 (goto-char date-end)
-	 (while (re-search-backward regexp date-start t)
-	   (shimbun-mhonarc-extract-header-values (, shimbun) (, url)
-						  (, headers) (, aux))
-	   (shimbun-header-set-date (car (, headers))
-				    (format "%s %s %s 00:00 +0000"
-					    day month year))
-	   (if (> (length (, headers)) shimbun-debian-fetch-headers-max)
-	       (throw 'stop (, headers)))
-	   (forward-line 0)))
-       (, headers))))
+  `(let ((case-fold-search t)
+	 (regexp (or (shimbun-mhonarc-litemplate-regexp-internal ,shimbun)
+		     shimbun-mhonarc-litemplate-regexp))
+	 (year (and (string-match (concat (regexp-quote (shimbun-index-url
+							 shimbun))
+					  "\\([0-9]+\\)")
+				  url)
+		    (match-string 1 url)))
+	 month day date-start date-end)
+     (goto-char (point-max))
+     (while (and (setq date-end (re-search-backward "^</ul>" nil t))
+		 (setq date-start (re-search-backward "^<ul>" nil t)))
+       (forward-line -1)
+       (looking-at "^\\(\\w+\\) \\([0-9]+\\)")
+       (setq month (match-string 1)
+	     day (match-string 2))
+       (goto-char date-end)
+       (while (re-search-backward regexp date-start t)
+	 (shimbun-mhonarc-extract-header-values ,shimbun ,url ,headers ,aux)
+	 (shimbun-header-set-date (car ,headers)
+				  (format "%s %s %s 00:00 +0000"
+					  day month year))
+	 (if (> (length ,headers) shimbun-debian-fetch-headers-max)
+	     (throw 'stop ,headers))
+	 (forward-line 0)))
+     ,headers))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-debian)
 					 &optional range)
@@ -151,7 +151,7 @@
 	  (shimbun-retrieve-url (format base-url "list") t)
 	  (re-search-forward
 	   "<td\\( align=\"center\"><b\\)?>Page [0-9]+ of \\([0-9]+\\)\\(</b><br>\\)?</td>")
-	  (let* ((page-max (string-to-int (match-string 2)))
+	  (let* ((page-max (string-to-number (match-string 2)))
 		 (i page-max))
 	    (while (> i 1)
 	      (setq url (format base-url i))
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-debugmagazin-de.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-dennou.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-dennou.el
--- work/emacs-w3m-1.4.4/shimbun/sb-dennou.el	2005-03-14 07:25:37.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-dennou.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 (require 'shimbun)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-digiko.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-digiko.el
--- work/emacs-w3m-1.4.4/shimbun/sb-digiko.el	2005-03-14 07:25:36.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-digiko.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-digiko.el --- shimbun backend for digiko-ML.
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Akihiro Arisawa <ari@mbf.sphere.ne.jp>
+;; Copyright (C) 2001, 2002, 2003, 2004, 2007
+;; Akihiro Arisawa <ari@mbf.sphere.ne.jp>
 
 ;; Author: Akihiro Arisawa <ari@mbf.sphere.ne.jp>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
@@ -39,26 +40,26 @@
   "<STRONG><a name=\"\\([0-9]+\\)\" href=\"\\(msg[0-9]+.html\\)\">\\([^<]+\\)</a></STRONG>\n<UL><LI><EM>From</EM>: \\(.+\\) \\(\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\), [ 0-9]+ [A-Z][a-z][a-z] [0-9]+ [0-2][0-9]:[0-5][0-9]:[0-5][0-9] .*\\)</LI>")
 
 (defmacro shimbun-digiko-get-headers (shimbun url headers)
-  (` (let ((case-fold-search t))
-       (goto-char (point-min))
-       (while (re-search-forward
-	       (shimbun-mhonarc-litemplate-regexp-internal (, shimbun))
-	       nil t)
-	 (let ((id (format "<%s%%%s>" (match-string 1)
-			   (shimbun-current-group-internal (, shimbun))))
-	       (xref (shimbun-expand-url (match-string 2) (, url)))
-	       (subject (shimbun-mhonarc-replace-newline-to-space
-			 (match-string 3)))
-	       (from (shimbun-mhonarc-replace-newline-to-space
-		      (match-string 4)))
-	       (date (match-string 5)))
-	   (if (shimbun-search-id (, shimbun) id)
-	       (throw 'stop (, headers))
-	     (push (shimbun-make-header 0
-					(shimbun-mime-encode-string subject)
-					(shimbun-mime-encode-string from)
-					date id "" 0 0 xref)
-		   (, headers))))))))
+  `(let ((case-fold-search t))
+     (goto-char (point-min))
+     (while (re-search-forward
+	     (shimbun-mhonarc-litemplate-regexp-internal ,shimbun)
+	     nil t)
+       (let ((id (format "<%s%%%s>" (match-string 1)
+			 (shimbun-current-group-internal ,shimbun)))
+	     (xref (shimbun-expand-url (match-string 2) ,url))
+	     (subject (shimbun-mhonarc-replace-newline-to-space
+		       (match-string 3)))
+	     (from (shimbun-mhonarc-replace-newline-to-space
+		    (match-string 4)))
+	     (date (match-string 5)))
+	 (if (shimbun-search-id ,shimbun id)
+	     (throw 'stop ,headers)
+	   (push (shimbun-make-header 0
+				      (shimbun-mime-encode-string subject)
+				      (shimbun-mime-encode-string from)
+				      date id "" 0 0 xref)
+		 ,headers))))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-digiko)
 					 &optional range)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-elips.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-elips.el
--- work/emacs-w3m-1.4.4/shimbun/sb-elips.el	2003-03-07 08:09:39.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-elips.el	2008-03-27 20:44:01.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-elips.el --- shimbun backend for the Elips mailing list
 
-;; Copyright(C) 2003 Katsumi Yamaoka
+;; Copyright(C) 2003, 2008 Katsumi Yamaoka
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news
@@ -18,20 +18,20 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
 (require 'shimbun)
-(require 'sb-fml)
+(require 'sb-mailman)
 
-(luna-define-class shimbun-elips (shimbun-fml) ())
+(luna-define-class shimbun-elips (shimbun-mailman-ja) ())
 
-(defvar shimbun-elips-url "http://heimat.jp/~nakaji/elips/")
+(defvar shimbun-elips-url "http://www.heimat.gr.jp/pipermail/elips/")
 (defvar shimbun-elips-groups '("elips"))
 (defvar shimbun-elips-x-face-alist
   '(("default" . "X-Face: 4(*_4GGM'.9>v7]}eY@L8:2Zn7:&ANIR4778Vg*'(f\
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-emacs-w3m.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-emacs-w3m.el
--- work/emacs-w3m-1.4.4/shimbun/sb-emacs-w3m.el	2004-06-25 12:41:06.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-emacs-w3m.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-emacswiki.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-emacswiki.el
--- work/emacs-w3m-1.4.4/shimbun/sb-emacswiki.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-emacswiki.el	2005-12-22 14:42:27.000000000 +0900
@@ -19,16 +19,13 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 (require 'sb-rss)
 
@@ -76,8 +73,8 @@
 	(setq url (and (listp item)
 		       (eq (intern (concat rss-ns "item")) (car item))
 		       (if (string= (shimbun-current-group shimbun) "changes")
-			   (shimbun-rss-node-text rss-ns 'link (cddr item))
-			 (shimbun-rss-node-text wiki-ns 'diff (cddr item)))))
+			   (shimbun-rss-node-text rss-ns 'link item)
+			 (shimbun-rss-node-text wiki-ns 'diff item))))
 	(when url
 	  (let* ((date (or (shimbun-rss-node-text dc-ns 'date item)
 			   (shimbun-rss-node-text rss-ns 'pubDate item)))
@@ -85,8 +82,12 @@
 	    (unless (shimbun-search-id shimbun id)
 	      (push (shimbun-create-header
 		     0
-		     (shimbun-rss-node-text rss-ns 'title item)
-		     (or (shimbun-rss-node-text dc-ns 'contributor item)
+		     (let ((desc (shimbun-rss-node-text rss-ns 'description
+							item)))
+		       (concat (shimbun-rss-node-text rss-ns 'title item)
+			       (if desc
+				   (concat " - " desc))))
+		     (or (shimbun-rss-node-text wiki-ns 'username item)
 			 (shimbun-from-address shimbun))
 		     (shimbun-rss-process-date shimbun date)
 		     id "" 0 0 url)
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-engadget-ja.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-excite.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-excite.el
--- work/emacs-w3m-1.4.4/shimbun/sb-excite.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-excite.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-excite.el --- shimbun backend for excite -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2004, 2005 Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Copyright (C) 2004, 2005, 2006, 2010 Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
-;; Author: Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Author: Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 ;; Created: Dec 24, 2004
 
@@ -19,17 +19,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
 (require 'sb-rss)
 
@@ -49,9 +46,9 @@
 (defvar shimbun-excite-from-address (concat "nobody@"
 					    shimbun-excite-top-level-domain))
 (defvar shimbun-excite-content-start
-  "\\[ +[0-9]*年[0-9]*月[0-9]*日 *[0-9]*時[0-9]*分 +\\]")
+  "<font[^>]*>\\[ *[0-9]*年[0-9]*月[0-9]*日 *[0-9]*時[0-9]*分 *\\]</font>")
 (defvar shimbun-excite-content-end
-  "<a href=/News/>ニューストップ</a>")
+  "<center")
 
 ;(defvar shimbun-excite-expiration-days 14)
 
@@ -77,17 +74,14 @@
 	  (cdr  (assoc  (shimbun-current-group-internal shimbun)
 			shimbun-excite-group-alist))))
 
-(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-excite)
-						  url date)
-		    (unless (string-match
-			     (concat (regexp-quote shimbun-excite-url)
-				     "\\([^/]\\)*/\\([0-9]+\\)\.html?")
-			     url)
-		      (error "Cannot find message-id base"))
-		    (concat "<"
-			    (match-string-no-properties 1 url)
-			    (match-string-no-properties 2 url)
-			    "@" shimbun-excite-top-level-domain ">"))
+(luna-define-method shimbun-rss-build-message-id :around
+  ((shimbun shimbun-excite) url date)
+  (if (string-match
+       (concat (regexp-quote shimbun-excite-url)
+	       "\\([^/]\\)*/\\([0-9]+\\)\.html?")
+       url)
+      (luna-call-next-method)
+    nil))
 
 (luna-define-method shimbun-get-headers :around ((shimbun shimbun-excite)
 						 &optional range)
@@ -96,11 +90,10 @@
       (shimbun-header-set-from header (shimbun-from-address shimbun)))
     headers))
 
-(luna-define-method shimbun-clear-contents :before
-  ((shimbun shimbun-excite) header)
+(luna-define-method shimbun-clear-contents :before ((shimbun shimbun-excite)
+						    header)
   (shimbun-strip-cr)
-  (shimbun-remove-tags "<script" "</script>")
-  (shimbun-remove-tags "<noscript" "</noscript>"))
+  (shimbun-remove-tags "script\\|noscript" t))
 
 (provide 'sb-excite)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-exconn.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-exconn.el
--- work/emacs-w3m-1.4.4/shimbun/sb-exconn.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-exconn.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-exconn.el --- shimbun backend for eXperts Connection
 
-;; Copyright (C) 2004, 2005 Yoichi NAKAYAMA <yoichi@geiin.org>
+;; Copyright (C) 2004, 2005, 2006 Yoichi NAKAYAMA <yoichi@geiin.org>
 
 ;; Author: Yoichi NAKAYAMA <yoichi@geiin.org>
 ;; Keywords: news
@@ -19,17 +19,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
 (require 'sb-rss)
 
@@ -44,13 +41,6 @@
 (defvar shimbun-exconn-content-end
   "<!-- - -KB 3 end- - -->")
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-exconn) url date)
-  (unless (string-match "\
-http://support.microsoft.com/default.aspx\\?scid=kb;ja;\\([0-9]+\\)" url)
-    (error "Cannot find message-id base"))
-  (concat "<" (match-string-no-properties 1 url) "@support.microsoft.com>"))
-
 (luna-define-method shimbun-rss-process-date ((shimbun shimbun-exconn) date)
   (cond ((null date)
 	 "")
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-f1fan.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-f1fan.el
--- work/emacs-w3m-1.4.4/shimbun/sb-f1fan.el	2005-03-14 07:14:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-f1fan.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,21 +19,23 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 back end generates text/plain articles unless failing to
+;; extract contents.
+
 ;; Original code was nnshimbun.el written by
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>.
 
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-f1fan (shimbun shimbun-text) ())
+(luna-define-class shimbun-f1fan (shimbun) ())
 
 (defvar shimbun-f1fan-url "http://www.ksky.ne.jp/~tahara/f1/")
 (defvar shimbun-f1fan-server-name "F1ファン")
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-fau.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-fau.el
--- work/emacs-w3m-1.4.4/shimbun/sb-fau.el	2005-03-22 20:42:04.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-fau.el	2007-02-22 18:35:47.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-fau.el --- Freie ArbeiterInnen Union shimbun backend
 
-;; Copyright (C) 2005 David Hansen
+;; Copyright (C) 2005, 2006, 2007 David Hansen
 
 ;; Author: David Hansen <david.hansen@physik.fu-berlin.de>
 ;; Keywords: news
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -38,13 +38,12 @@
 (defvar shimbun-fau-x-face-alist
   '(("default" .
      "X-Face: 5Nxj%|<|TGh94(OzpKK*3XE{c=jFM9F7Mngs2BJva%Cs2jH>DThKw\
-[h'n|GAMyNEJ~*y%59xj5d31q4(xg_<tOrJ_\"NaXys5yh~3P_u\\]VOC!3:N+O,>=>O+w}\
+\[h'n|GAMyNEJ~*y%59xj5d31q4(xg_<tOrJ_\"NaXys5yh~3P_u\\]VOC!3:N+O,>=>O+w}\
 <l-KjY3.MV#@*}26P^'2$E_8<6'}rz:0,6K")))
 
 (defvar shimbun-fau-content-start "<hr\\s-+size=\"1\">")
 (defvar shimbun-fau-content-end "<hr\\s-+size=\"1\">\\s-*
-<p>\\s-*
-..*?<a\\s-+class=\"red\"\\s-+href=\"javascript:window.print()\"")
+<p>\\s-*")
 
 (defvar shimbun-fau-coding-system
   (or (shimbun-find-coding-system 'windows-1252)
@@ -63,12 +62,6 @@
      header)
    (luna-call-next-method)))
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-fau) url date)
-  (unless (string-match "/[^/]*$" url)
-    (error "Cannot find message-id base"))
-  (concat "<" (match-string 0 url) "@fau.de>"))
-
 (luna-define-method shimbun-article ((shimbun shimbun-fau) header
 				     &optional outbuf)
   (when (shimbun-current-group-internal shimbun)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-ffii.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ffii.el
--- work/emacs-w3m-1.4.4/shimbun/sb-ffii.el	2005-02-24 13:16:16.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ffii.el	2007-10-17 20:15:58.000000000 +0900
@@ -22,9 +22,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-fml.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-fml.el
--- work/emacs-w3m-1.4.4/shimbun/sb-fml.el	2005-03-14 07:25:39.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-fml.el	2010-01-13 09:59:30.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-fml.el --- shimbun backend class for fml archiver.
 
-;; Copyright (C) 2001, 2002, 2003, 2004
+;; Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010
 ;; Akihiro Arisawa <ari@mbf.sphere.ne.jp>
-;; Copyright (C) 2001, 2002, 2003, 2004
+;; Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010
 ;; Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
@@ -23,9 +23,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -41,7 +41,7 @@
 
 (luna-define-class shimbun-fml (shimbun) ())
 
-(defsubst shimbun-fml-parse-time (str)
+(defun shimbun-fml-parse-time (str)
   (save-match-data
     (if (string-match
 	 "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\) \\([0-9]+:[0-9]+:[0-9]+\\)"
@@ -97,14 +97,10 @@
 	(delete-region (point-min) (point))
       (throw 'stop nil))
     (if (search-forward "</PRE>" nil t)
-	(progn
-	  (beginning-of-line)
-	  (delete-region (point) (point-max)))
+	(delete-region (point-at-bol) (point-max))
       (throw 'stop nil))
     (if (search-backward "</SPAN>" nil t)
-	(progn
-	  (beginning-of-line)
-	  (delete-region (point) (save-excursion (end-of-line) (point))))
+	(delete-region (point-at-bol) (point-at-eol))
       (throw 'stop nil))
     (save-restriction
       (narrow-to-region (point-min) (point))
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-gendai-net.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-geocrawler.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-geocrawler.el
--- work/emacs-w3m-1.4.4/shimbun/sb-geocrawler.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-geocrawler.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -29,9 +29,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 
 (luna-define-class shimbun-geocrawler (shimbun) ())
@@ -117,7 +114,7 @@
 			    "http://www.geocrawler.com/mail/msg_raw.php3?msg_id="
 			    (match-string 1)))
 			  (id (concat "<" (match-string 1) "@geocrawler.com>"))
-			  (eol (line-end-position)))
+			  (eol (point-at-eol)))
 		      (when (shimbun-search-id shimbun id)
 			(throw 'stop nil))
 		      (push (shimbun-make-header
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-glimpse.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-glimpse.el
--- work/emacs-w3m-1.4.4/shimbun/sb-glimpse.el	2003-11-18 10:57:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-glimpse.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-gnome.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-gnome.el
--- work/emacs-w3m-1.4.4/shimbun/sb-gnome.el	2005-03-14 07:31:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-gnome.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-haiku-os.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-haiku-os.el
--- work/emacs-w3m-1.4.4/shimbun/sb-haiku-os.el	2004-08-03 13:03:08.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-haiku-os.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-haiku-os.el --- shimbun backend for haiku-os.org
 
-;; Copyright (C) 2004 Yoichi NAKAYAMA <yoichi@geiin.org>
+;; Copyright (C) 2004, 2006 Yoichi NAKAYAMA <yoichi@geiin.org>
 
 ;; Author: Yoichi NAKAYAMA <yoichi@geiin.org>
 ;; Keywords: news
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -50,12 +50,6 @@
 (luna-define-method shimbun-rss-process-date ((shimbun shimbun-haiku-os) date)
   date)
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-haiku-os) url date)
-  (unless (string-match "=\\([0-9]+\\)\\>" url)
-    (error "Cannot find message-id base"))
-  (concat "<" (match-string-no-properties 1 url) "%" (shimbun-current-group shimbun) "@haiku-os.org>"))
-
 (luna-define-method shimbun-make-contents :around ((shimbun shimbun-haiku-os)
 						   &optional header)
   (let ((entry (assoc (shimbun-current-group shimbun)
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-hash.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-heise.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-heise.el
--- work/emacs-w3m-1.4.4/shimbun/sb-heise.el	2005-03-22 06:50:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-heise.el	2009-10-06 07:17:32.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-heise.el --- heise online shimbun backend
 
-;; Copyright (C) 2004, 2005 David Hansen
+;; Copyright (C) 2004, 2005, 2008, 2009 David Hansen
 
 ;; Author: David Hansen <david.hansen@physik.fu-berlin.de>
 ;; Keywords: news
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -38,9 +38,10 @@
 
 
 (defvar shimbun-heise-content-start
-  "\\(<!-- Meldung -->\\|<!-- INHALT -->\\|<HEISETEXT>\\)")
+  "\\(<!-- Meldung -->\\|<!-- INHALT -->\\|<[^>]*HEISETEXT[^>]*>\\)")
 (defvar shimbun-heise-content-end
-  "\\(<!-- untere News-Navigation -->\\|<!-- INHALT -->\\|</HEISETEXT>\\)")
+  "\\(<!-- untere News-Navigation -->\\|<!-- INHALT -->\
+\\|<[^>]*/HEISETEXT[^>]*>\\)")
 
 (defvar shimbun-heise-x-face-alist
   '(("default" . "X-Face: #RVD(kjrS;RY\"2yH]w.1U,ZC_DbR,9{tQnhyYe|,\\J)\"\
@@ -59,13 +60,15 @@
 
 
 (defun shimbun-heise-get-newsticker-headers (shimbun)
-  (let ((regexp "<a href=\"meldung/\\([0-9]+\\)\">\\([^<]+\\)</a>")
+  (let ((regexp
+	 "<a href=\"/newsticker/\\(meldung/.+\\.html\\)\"[^>]*>\\([^<]+\\)</a>")
 	(from "Heise Online News <invalid@heise.de>")
-	(date "") (id) (url) (subject) (headers))
+	(date "") (longurl) (id) (url) (subject) (headers))
     (catch 'stop
       (while (re-search-forward regexp nil t nil)
-	(setq id (match-string 1))
-	(setq url (shimbun-expand-url (concat "meldung/" id)
+	(setq longurl (match-string 1))
+	(setq id (md5 longurl))
+	(setq url (shimbun-expand-url longurl
 				      (shimbun-index-url shimbun)))
 	(setq subject (match-string 2))
 	(setq id (concat "<newsticker" id "@heise.de>"))
@@ -92,33 +95,33 @@
   (let (headers (limit (re-search-forward shimbun-heise-date-re nil t)))
     (catch 'stop
       (while limit
-        (goto-char limit)
-        (let ((day (match-string 1))
-              (month (match-string 2))
-              (year (match-string 3)))
-          (setq limit (save-excursion
-                        (re-search-forward shimbun-heise-date-re nil t)))
-          (save-match-data
-            (while (re-search-forward shimbun-heise-url-re limit t)
-              (let ((url (match-string 1))
-                    (mid (concat "<" (match-string 2) "x"
-                                 (match-string 3) "@heise.de>"))
-                    (subj (match-string 4)))
-                (when (shimbun-search-id shimbun mid)
-                  (throw 'stop nil))
-                (when (re-search-forward shimbun-heise-author-re limit t)
-                  (let ((author (match-string 1)))
-                    (push (shimbun-create-header
-                           0 subj author
-                           (shimbun-make-date-string
-                            (string-to-number year)
-                            (string-to-number month)
-                            (string-to-number day)
-                            "00:00"
-                            ;; FIXME: timezone is always wrong, slightly better than
-                            ;; the default "+0900"
-                            "+0000")
-                           mid "" 0 0 url) headers)))))))))
+	(goto-char limit)
+	(let ((day (match-string 1))
+	      (month (match-string 2))
+	      (year (match-string 3)))
+	  (setq limit (save-excursion
+			(re-search-forward shimbun-heise-date-re nil t)))
+	  (save-match-data
+	    (while (re-search-forward shimbun-heise-url-re limit t)
+	      (let ((url (match-string 1))
+		    (mid (concat "<" (match-string 2) "x"
+				 (match-string 3) "@heise.de>"))
+		    (subj (match-string 4)))
+		(when (shimbun-search-id shimbun mid)
+		  (throw 'stop nil))
+		(when (re-search-forward shimbun-heise-author-re limit t)
+		  (let ((author (match-string 1)))
+		    (push (shimbun-create-header
+			   0 subj author
+			   (shimbun-make-date-string
+			    (string-to-number year)
+			    (string-to-number month)
+			    (string-to-number day)
+			    "00:00"
+			    ;; FIXME: timezone is always wrong, slightly better
+			    ;; than the default "+0900"
+			    "+0000")
+			   mid "" 0 0 url) headers)))))))))
     headers))
 
 (luna-define-method shimbun-get-headers
@@ -132,8 +135,8 @@
   (save-excursion
 
     ;; get the real date
-    (let ((regexp-date-begin "<!-- \\*\\*\\* tmpl \\*\\*\\* -->")
-	  (regexp-date-end "<!-- obere News-Navigation -->")
+    (let ((regexp-date-begin "<div id=\"mitte_news\">")
+	  (regexp-date-end "<div class=\"news_logo\">")
 	  (regexp-date (concat "\\([0-9]+\\)\\.\\([0-9]+\\)\\."
 			       "\\([0-9]+\\)[ \t]+\\([0-9]+\\:[0-9]+\\)"))
 	  (tmp-point) (bound-point))
@@ -147,16 +150,15 @@
 	      (string-to-number (match-string 3)) ; year
 	      (string-to-number (match-string 2)) ; month
 	      (string-to-number (match-string 1)) ; day
-	      (match-string 4)		; time
+	      (match-string 4)                    ; time
 	      ;; FIXME: timezone is always wrong, slightly better than the
 	      ;; default "+0900"
 	      "+0000"))))))
 
     ;; get the real from
-    (let ((regexp-from-begin "<!-- Meldung -->\\|<HEISETEXT>")
-	  (regexp-from-end "<!-- untere News-Navigation -->")
-	  (regexp-from (concat "(<a href=\"mailto:\\([^@]+@ct.heise.de\\)\""
-			       "[^>]*>\\([^<]+\\)</a>"))
+    (let ((regexp-from-begin "<span class=\"ISI_IGNORE\">")
+	  (regexp-from-end "<br class=\"clear\"")
+	  (regexp-from "(<a href=\"mailto:\\(.+?\\)\" title=\"\\(.+?\\)\"")
 	  (tmp-point) (bound-point))
       (when (setq tmp-point (re-search-forward regexp-from-begin nil t nil))
 	(when (setq bound-point (re-search-forward regexp-from-end nil t nil))
@@ -165,34 +167,27 @@
 	    (shimbun-header-set-from
 	     header
 	     (shimbun-mime-encode-string
-	      (concat "Heise Online News, "
-		      (match-string 2)
+	      (concat (match-string 2)
 		      " <"
 		      (match-string 1)
 		      ">")))))))
+    (shimbun-remove-tags "<head>" "<div class=\"meldung_wrapper\">")
+    (shimbun-remove-tags "<span class=\"ISI_IGNORE\">" "</body>")))
 
-    ;; strip ads
-    (goto-char (point-min))
-    (let ((regexp-ad-begin "<!-- Meldung -->\\|<HEISETEXT>")
-	  (regexp-ad-end "<!-- untere News-Navigation -->")
-	  (regexp-ad "<!--OAS AD=\"Middle[0-9]*\"-->")
-	  (tmp-point) (bound-min) (bound-max))
-      (when (setq bound-min (re-search-forward regexp-ad-begin nil t nil))
-	(when (setq bound-max (re-search-forward regexp-ad-end nil t nil))
-	  (goto-char bound-min)
-	  (while (re-search-forward regexp-ad bound-max t nil)
-	    (let ((begin-region (re-search-backward "<table" bound-min t nil))
-		  (end-region (re-search-forward "</table>" bound-max t nil)))
-	      (when (and begin-region end-region)
-		(delete-region begin-region end-region)))))))))
 
 
 (defun shimbun-heise-wash-telepolis-article (header)
   (save-excursion
     ;; strip nasty "download" images
     (goto-char (point-min))
-    (while (re-search-forward "<TP:BUT>" nil t nil)
-      (delete-region (point) (re-search-forward "</TP:BUT>" nil t nil)))))
+    (while (re-search-forward "<TP\\(xBUT\\|:AD\\)>" nil t nil)
+      (delete-region (point) (re-search-forward "</TP\\(xBUT\\|:AD\\)>"
+						nil t nil)))
+    (goto-char (point-min))
+    (while (re-search-forward "<!--OAS AD=\"Middle[0-9]*" nil t nil)
+      (let ((beg (search-backward "<table" nil t nil))
+            (end (search-forward "</table>" nil t nil)))
+        (when (and beg end) (delete-region beg end))))))
 
 (luna-define-method shimbun-make-contents
   :before ((shimbun shimbun-heise) header)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-hns.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-hns.el
--- work/emacs-w3m-1.4.4/shimbun/sb-hns.el	2005-03-14 07:25:39.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-hns.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-ibm-dev.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ibm-dev.el
--- work/emacs-w3m-1.4.4/shimbun/sb-ibm-dev.el	2005-02-23 21:00:15.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ibm-dev.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-ibm-dev.el --- shimbun backend for www-6.ibm.com/ja/developerworks -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2003, 2005 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2001, 2003, 2005, 2007, 2010
+;; NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -33,95 +34,78 @@
 
 (luna-define-class shimbun-ibm-dev (shimbun) ())
 
-(defvar shimbun-ibm-dev-url "http://www-6.ibm.com/jp/developerworks/")
+(defvar shimbun-ibm-dev-url "http://www.ibm.com/jp/developerworks/")
 (defvar shimbun-ibm-dev-groups
   '("autonomic" "java" "linux" "opensource" "webservices" "xml"))
-(defvar shimbun-ibm-dev-from-address "webmaster@www-6.ibm.com")
 (defvar shimbun-ibm-dev-coding-system 'japanese-shift-jis-unix)
-(defvar shimbun-ibm-dev-content-start "<!--[ 　]*Contents[ 　]*-->")
-(defvar shimbun-ibm-dev-content-end
-  "<!--[ 　]*\\(\\(//\\|End[ 　]+of[ 　]\\)[ 　]*Contents\\|PDF Mail\\)[ 　]*-->")
+(defvar shimbun-ibm-dev-content-start "<!--Contents-->")
+(defvar shimbun-ibm-dev-content-end "<!--// Contents-->")
+
+(luna-define-method shimbun-index-url ((shimbun shimbun-ibm-dev))
+  (shimbun-expand-url (concat (shimbun-current-group shimbun) "/library.html")
+		      (shimbun-url-internal shimbun)))
+
+(luna-define-method shimbun-from-address ((shimbun shimbun-ibm-dev))
+  (concat "IBM developerWorks (" (shimbun-current-group shimbun) ")"))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-ibm-dev)
 					 &optional range)
-  (with-temp-buffer
-    (let* ((case-fold-search t)
-	   (from (shimbun-from-address shimbun))
-	   (pages (shimbun-header-index-pages range))
-	   (group (shimbun-current-group-internal shimbun))
-	   (baseurl (concat (shimbun-url-internal shimbun) group "/"))
-	   (count 0)
-	   aux headers id url subject date datelist indexes index)
-      (setq index (shimbun-expand-url "library.html" baseurl))
-      (shimbun-retrieve-url index 'reload)
-      (subst-char-in-region (point-min) (point-max) ?\t ?\  t)
-      (goto-char (point-min))
-      (push index indexes) ;; push latest
-      ;; check old lib
-      (while (re-search-forward "<a +href=\".*\\(library.+\\.html\\)\"" nil t)
-	(push (shimbun-expand-url (match-string-no-properties 1) baseurl)
-	      indexes))
-      (setq indexes (nreverse indexes))
-      (catch 'stop
-	(while (or (not pages)
-		   (<= (incf count) pages))
-	  (setq index (pop indexes))
-	  (unless index
-	    (throw 'stop nil))
-	  (erase-buffer)
-	  (shimbun-retrieve-url index 'reload)
-	  (subst-char-in-region (point-min) (point-max) ?\t ?\  t)
+  (catch 'stop
+    (let ((case-fold-search t)
+	  (base (shimbun-index-url shimbun))
+	  (indexes)
+	  (headers))
+      (let ((pages (shimbun-header-index-pages range)))
+	(goto-char (point-min))
+	(while (when (or (not pages)
+			 (< (length indexes) pages))
+		 (re-search-forward "<a +class=\"[^\"]+\" +\
+href=\"\\(library[0-9]*\\.s?html\\)\">[0-9]+年</a>" nil t))
+	  (push (shimbun-expand-url (match-string 1) base) indexes)))
+      (let ((pattern (format "/jp/developerworks/%s/"
+			     (regexp-quote (shimbun-current-group shimbun)))))
+	(dolist (index (nreverse indexes))
+	  (unless (string= index base)
+	    (erase-buffer)
+	    (shimbun-fetch-url shimbun index))
 	  (goto-char (point-min))
 	  (while (re-search-forward
-		  ;; getting URL, SUBJECT and DATE
-		  "<td><a href=\"\\(.*\\.html\\)\"\\([^>]+\\)?>\\(.*\\)</a> (\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)) *<br */?>"
-		  nil t)
-	    (setq url (match-string 1)
-		  subject (match-string 3)
-		  datelist (list (string-to-number (match-string 4))
-				 (string-to-number (match-string 5))
-				 (string-to-number (match-string 6)))
-		  date (apply 'shimbun-make-date-string datelist))
-	    ;; remove <b>...</b>(bold tag) if exist in subject
-	    (let ((start 0))
-	      (while (string-match "</?b>" subject start)
-		(setq subject (replace-match "" nil nil subject)
-		      start (match-beginning 0))))
-	    ;; adjusting URL
-	    (setq url (shimbun-expand-url url baseurl))
-	    ;; building ID
-	    (setq aux (if (string-match "\\([^/]+\\)\\.html" url)
-			  (match-string 1 url)
-			url))
-	    (setq id (format "<%s%%%02d%02d%02d%%%s@www-6.ibm.com>" aux
-			     (car datelist) (car (cdr datelist))
-			     (car (cdr (cdr datelist)))
-			     group))
-	    (when (shimbun-search-id shimbun id)
-	      (throw 'stop nil))
-	    (push (shimbun-make-header
-		   0 (shimbun-mime-encode-string subject)
-		   from date id "" 0 0 url)
-		  headers)
-	    (forward-line 1))))
+		  "<a href=\"\\([^\"]+\\)\"><b>\\([^<>]+\\)</b></a>" nil t)
+	    (let ((url (shimbun-expand-url (match-string 1) index))
+		  (subject (match-string 2)))
+	      (when (string-match pattern url)
+		(let ((id (concat "<" (md5 url)
+				  "%" (shimbun-current-group shimbun)
+				  "@" (shimbun-server shimbun)
+				  ".shimbun.namazu.org>")))
+		  (when (shimbun-search-id shimbun id)
+		    (throw 'stop headers))
+		  (push (shimbun-create-header nil subject
+					       (shimbun-from-address shimbun)
+					       nil id "" 0 0 url)
+			headers)))))))
       headers)))
 
-(luna-define-method shimbun-article-url ((shimbun shimbun-ibm-dev) header)
-  (with-temp-buffer
-    (let ((url (shimbun-article-base-url shimbun header)))
-      (shimbun-fetch-url shimbun url)
-      (if (re-search-forward "\
-<meta http-equiv=\"refresh\" +content=\"0;URL=\\(.+\\)\" */?>" nil t)
-	  (match-string 1)
-	url))))
-
 (luna-define-method shimbun-clear-contents :around ((shimbun shimbun-ibm-dev)
 						    header)
+  (goto-char (point-min))
+  (when (re-search-forward "<meta name=\"DC.Date\" scheme=\"iso8601\" \
+content=\"\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)\" />" nil t)
+    (shimbun-header-set-date header
+			     (shimbun-make-date-string
+			      (string-to-number (match-string 1))
+			      (string-to-number (match-string 2))
+			      (string-to-number (match-string 3)))))
+  (when (re-search-forward "<a href=\"#author[0-9]+\">\\([^<>]+\\)</a>" nil t)
+    (let ((name (match-string 1)))
+      (shimbun-header-set-from header
+			       (if (looking-at
+				    "[^\n]*<a href=\"mailto:\\([^\"?]+\\)[\"?]>")
+				   (concat name " <" (match-string 1) ">")
+				 name))))
   (when (luna-call-next-method)
-    (goto-char (point-min))
-    (when (re-search-forward "<p><a href=\"[^\"]*#author1\">" nil t)
-      (search-backward "<h2>" nil t)
-      (delete-region (point-min) (match-beginning 0)))
+    (shimbun-remove-tags "<!-- LEFTNAV_BEGIN -->" "<!-- LEFTNAV_END -->")
+    (shimbun-remove-tags "script" t)
     t))
 
 (provide 'sb-ibm-dev)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-impress.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-impress.el
--- work/emacs-w3m-1.4.4/shimbun/sb-impress.el	2005-03-08 15:41:56.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-impress.el	2009-09-18 17:41:26.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-impress.el --- shimbun backend for www.watch.impress.co.jp -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009
 ;; Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
@@ -19,55 +19,64 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
+
 (require 'shimbun)
-(require 'md5)
-(eval-when-compile
-  (require 'cl))
+(require 'sb-rss)
 
-(luna-define-class shimbun-impress (shimbun) ())
+(luna-define-class shimbun-impress (shimbun-rss) ())
 
 (defvar shimbun-impress-url "http://www.watch.impress.co.jp/")
 
 (defvar shimbun-impress-groups-alist
-  '( ;; group link-regexp start end address?
-    ("enterprise" "<a href=\"\\(/?cda/[^/]*/\\([0-9][0-9][0-9][0-9]\\)/\
-\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "<!-- 本文開始 -->" "<!-- 本文終了 -->" "http://enterprise.watch.impress.co.jp/")
-    ("pc" "<a href=\"\\(docs/\\([0-9][0-9][0-9][0-9]\\)/\\([0-9][0-9]\\)\
-\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "<!-- 記事見出し -->" "<!-- /記事署名 -->" "http://pc.watch.impress.co.jp/")
-    ("dc" "<a href=\"\\(cda/[^/]*/\\([0-9][0-9][0-9][0-9]\\)/\
-\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "<!-- 本文開始 -->" "<!-- 本文終了 -->" "http://dc.watch.impress.co.jp/")
+  '( ;; group (rss | link-regexp) start end address?
+    ("enterprise" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://enterprise.watch.impress.co.jp/cda/rss/enterprise.rdf")
+    ("pc" rss
+     "<!-- 記事見出し -->" "<!-- /記事署名 -->"
+     "http://pc.watch.impress.co.jp/sublink/pc.rdf")
+    ("dc" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://dc.watch.impress.co.jp/cda/rss/digicame.rdf")
     ("akiba" "<a href=\"\\(hotline/\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\
-\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">" "<!-- ↑↑　★2002/10/01 Modify End★　↑↑ -->"
-"\\(<!-- ↓↓　★2002/10/01 Modify start★　↓↓ -->\\|<!-- 500x144 -->\\)")
-    ("av" "<a href=\"\\(docs/\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\
-\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "\\(<!-- title -->\\|<hr size=3>\\)" "\\(<!-- /記事署名 -->\\|<!-- 500x144 -->\\)")
-    ("game" "<a href=\"\\(docs/\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\
-\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "\\(<tr>\n<td valign=TOP>\\|<!-- 本文開始 -->\\)" "<!-- /記事署名 -->")
-    ("k-tai" "<a href=\"\\(/?cda/[^/]*/[^/]*/\\([0-9]+\\)[^>\"]*\\)\">"
-     "<!-- ?本文開始 ?-->" "<!-- ?本文終了 ?-->" "http://k-tai.impress.co.jp/")
-    ("internet" "<a href=\"\\(cda/news/\\([0-9][0-9][0-9][0-9]\\)/\
-\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
-     "<!-- 本文開始 -->" "<!-- 本文終了 -->" "http://internet.watch.impress.co.jp/")
-    ("bb" "<a href=\"\\(/?cda/[^/]*/\\([0-9]+\\)[^>\"]*\\)\">"
-     "<!-- ?本文開始 ?-->" "<!-- ?本文終了 ?-->" "http://bb.watch.impress.co.jp/")
-    ("forest"
-     "<a href=\"\\(/?article/\\([0-9][0-9][0-9][0-9]\\)/\\([0-9][0-9]\\)/\
 \\([0-9][0-9]\\)/\\([^>]*\\)\\)\">"
+     "<!-- ↑↑　★2002/10/01 Modify End★　↑↑ -->"
+     "\\(<!-- ↓↓　★2002/10/01 Modify start★　↓↓ -->\\|<!-- 500x144 -->\\)")
+    ("av" rss
+     "\\(<!-- title -->\\|<hr size=3>\\)" "\\(<!-- /記事署名 -->\\|<!-- 500x144 -->\\)"
+     "http://www.watch.impress.co.jp/av/sublink/av.rdf")
+    ("game" rss
+     "<!-- 記事中央開始 -->" "\\(<!-- 記事中央終了 -->\\|<!-- /記事署名 -->\\)"
+     "http://www.watch.impress.co.jp/game/sublink/game.rdf")
+    ("k-tai" rss
+     "<!-- ?本文開始 ?-->" "<!-- ?本文終了 ?-->"
+     "http://k-tai.impress.co.jp/cda/rss/ktai.rdf")
+    ("internet" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://internet.watch.impress.co.jp/cda/rss/internet.rdf")
+    ("bb" rss
+     "<!-- ?本文開始 ?-->" "<!-- ?本文終了 ?-->"
+     "http://bb.watch.impress.co.jp/cda/rss/broadband.rdf")
+    ("forest" rss
      "<!-- ?\\(▲▲▲ダイレクト関連▲▲▲\\|本文開始\\) ?-->"
      "<!-- ?\\(本文終了\\|■■■■本文セル右スペースセル■■■■\\|■goostick開始■\\) ?-->"
-     "http://www.forest.impress.co.jp/")
+     "http://www.forest.impress.co.jp/rss.xml")
+    ("robot" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://robot.watch.impress.co.jp/cda/rss/robot.rdf")
+    ("kaden" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://kaden.watch.impress.co.jp/cda/rss/kaden.rdf")
+    ("car" rss
+     "<!-- 本文開始 -->" "<!-- 本文終了 -->"
+     "http://car.watch.impress.co.jp/docs/car.rdf")
     ))
 
 (defvar shimbun-impress-groups (mapcar 'car shimbun-impress-groups-alist))
@@ -78,6 +87,7 @@
 JzTbXTM!V{ecn<+l,RDM&H3CKdu8tWENJlbRm)a|Hk+limu}hMtR\\E!%r\
 9wC\"6\n ebr5rj1[UJ5zDEDsfo`N7~s%;P`\\JK'#y.w^>K]E~{`wZru")))
 ;;(defvar shimbun-impress-expiration-days 7)
+(defvar shimbun-impress-ignored-subject "^\\(AD\\|PR\\):")
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-impress))
   (or (nth 4 (assoc (shimbun-current-group-internal shimbun)
@@ -85,8 +95,13 @@
       (concat (shimbun-url-internal shimbun)
 	      (shimbun-current-group-internal shimbun) "/")))
 
-(defsubst shimbun-impress-get-headers-date (shimbun &optional range)
-  "get headers for url is date.target is all groups \"k-tai\" and \"bb\"is not included."
+(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-impress)
+						  url &optional date)
+  (concat "<" (md5 url) "%" (shimbun-current-group shimbun)
+	  "@www.watch.impress.co.jp>"))
+
+(defun shimbun-impress-get-headers (shimbun &optional range)
+  "Get headers without RSS."
   (let ((case-fold-search t)
 	(regexp (nth 1 (assoc (shimbun-current-group-internal shimbun)
 			      shimbun-impress-groups-alist)))
@@ -130,61 +145,19 @@
 		headers))))
     headers))
 
-(defsubst shimbun-impress-get-headers-sequence (shimbun &optional range)
-  "get headers for url is sequence number.target is  \"k-tai\" and \"bb\"."
-  (let ((case-fold-search t)
-	(regexp (nth 1 (assoc (shimbun-current-group-internal shimbun)
-			      shimbun-impress-groups-alist)))
-	ids
-	headers)
-    (goto-char (point-min))
-    (while (re-search-forward regexp nil t)
-      (let* ((apath (match-string 1))
-	     (number (string-to-number (match-string 2)))
-	     (url (shimbun-expand-url apath (shimbun-index-url shimbun)))
-	     (pos (point))
-	     subject
-	     id)
-	(when (re-search-forward "</TD>" nil t)
-	  (setq subject (buffer-substring pos (match-beginning 0))
-		subject (with-temp-buffer
-			  (insert subject)
-			  (goto-char (point-min))
-			  (when (re-search-forward "<br>\\(−\\|〜\\).*" nil t)
-			    (replace-match "")
-			    (goto-char (point-min)))
-			  (while (re-search-forward "[\r\n]" nil t)
-			    (replace-match ""))
-			  (shimbun-remove-markup)
-			  (buffer-string))))
-	(setq id (concat "<" (md5 url) "%" (shimbun-current-group shimbun)
-			 "www.watch.impress.co.jp>"))
-	(unless (member id ids)
-	  (setq ids (cons id ids))
-	  (push (shimbun-create-header
-		 number
-		 (or subject "")
-		 (shimbun-from-address shimbun)
-		 ""
-		 id
-		 "" 0 0
-		 url)
-		headers))))
-    headers))
+(luna-define-method shimbun-headers :around ((shimbun shimbun-impress)
+					     &optional range)
+  (if (eq (nth 1 (assoc (shimbun-current-group-internal shimbun)
+			shimbun-impress-groups-alist))
+	  'rss)
+      (luna-call-next-method)
+    (with-temp-buffer
+      (shimbun-fetch-url shimbun (shimbun-index-url shimbun) t)
+      (shimbun-remove-tags "<!--" "-->") ;; clear comment-outed html source
+      (shimbun-impress-get-headers shimbun range))))
 
-(luna-define-method shimbun-get-headers ((shimbun shimbun-impress)
-					 &optional range)
-  (shimbun-remove-tags "<!--" "-->") ;; clear comment-outed html source
-  (cond
-   ;; k-tai and bb
-   ((or (equal "k-tai" (shimbun-current-group-internal shimbun))
-	(equal "bb"    (shimbun-current-group-internal shimbun)))
-    (shimbun-impress-get-headers-sequence shimbun range))
-   ;; all others
-   (t
-    (shimbun-impress-get-headers-date shimbun range)
-    )
-   ))
+(luna-define-method shimbun-article-url :around ((shimbun shimbun-impress) header)
+  (shimbun-real-url (luna-call-next-method)))
 
 (luna-define-method shimbun-make-contents :around ((shimbun shimbun-impress)
 						   &optional header)
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-infoshop.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-itmedia.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-itmedia.el
--- work/emacs-w3m-1.4.4/shimbun/sb-itmedia.el	2005-03-14 07:25:40.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-itmedia.el	2011-10-11 11:02:14.000000000 +0900
@@ -1,9 +1,11 @@
 ;;; sb-itmedia.el --- shimbun backend for ITmedia -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2004, 2005 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2004-2011 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
-;;         Yuuichi Teranishi  <teranisi@gohome.org>
+;;         Yuuichi Teranishi  <teranisi@gohome.org>,
+;;         ARISAWA Akihiro    <ari@mbf.sphere.ne.jp>,
+;;         Katsumi Yamaoka    <yamaoka@jpl.org>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -19,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -34,218 +36,279 @@
   (require 'cl))
 
 (require 'shimbun)
+(require 'sb-rss)
+(require 'sb-multi)
 
-(luna-define-class shimbun-itmedia (shimbun) ())
-
-(defvar shimbun-itmedia-url "http://www.itmedia.co.jp/")
+(luna-define-class shimbun-itmedia (shimbun-multi shimbun-rss) ())
 
 (defvar shimbun-itmedia-group-alist
-  (let ((template (concat "<a href=\""
-			  "\\(" (regexp-quote shimbun-itmedia-url) "\\|/\\)"
-			  "\\(\\(%s\\)/\\([0-9][0-9]\\)\\([0-9][0-9]\\)\
-/\\([0-9][0-9]\\)/\\([^\\.\">]+\\)\\.html\\)[^>]*>")))
-    `(("anchordesk" "anchordesk"
-       ,(format template "anchordesk/articles")
-       "［[^ ]* \\([0-9]+:[0-9]+\\)］")
-      ("bursts" "news/bursts"
-       ,(format template "enterprise/articles\\|news/articles")
-       "［[^ ]* \\([0-9]+:[0-9]+\\)］")
-      ("business" "news/business"
-       ,(format template "news/articles")
-       nil)
-      ("enterprise" "enterprise"
-       ,(format template "enterprise/articles")
-       "［[^ ]* \\([0-9]+:[0-9]+\\)］")
-      ("games" "games/news"
-       ,(format template "games/articles")
-       nil)
-      ("lifestyle" "lifestyle"
-       ,(format template "lifestyle/articles")
-       nil)
-      ("mobile" "mobile/news"
-       ,(format template "mobile/articles")
-       nil)
-      ("news" "news/past"
-       ,(format template "news/articles")
-       "(\\([0-9]+:[0-9]+\\))")
-      ("pcupdate" "pcupdate/news"
-       ,(format template "pcupdate/articles")
-       nil)
-      ("technology" "news/technology"
-       ,(format template "news/articles")
-       nil))))
+  `(,@(mapcar
+       (lambda (group)
+	 (list (concat "news." group) (concat "news_" group)))
+       '("bursts" "domestic" "foreign" "products" "technology" "web20"
+	 "nettopics" "society" "security" "industry" "research" "sp_amd"))
+    ("anchordesk" "anchordesk")
+    ("bizid" "bizid")
+    ("enterprise" "enterprise")
+    ,@(mapcar
+       (lambda (group)
+	 (list (concat "+D." group) group))
+       '("plusd" "mobile" "pcupdate" "lifestyle" "games" "docomo" "au_kddi"
+	 "vodafone" "shopping"))
+    ,@(mapcar
+       (lambda (def)
+	 (nconc (list (concat "+D.lifestyle.column." (car def)) nil) def))
+       '(("asakura" "麻倉怜士"
+	  "http://www.itmedia.co.jp/keywords/emma.html")
+	 ("honda" "本田雅一")
+	 ("kobayashi" "こばやしゆたか")
+	 ("kodera" "小寺信良"
+	  "http://www.itmedia.co.jp/keywords/kodera_nobuyoshi.html")
+	 ("nishi" "西正")
+	 ("ogikubo" "荻窪圭"
+	  "http://plusd.itmedia.co.jp/lifestyle/features/satuei/")
+	 ("tachibana" "橘十徳"
+	  "http://plusd.itmedia.co.jp/lifestyle/features/jibara/")
+	 ("takemura" "竹村譲")
+	 ("unakami" "海上忍"
+	  "http://plusd.itmedia.co.jp/lifestyle/features/keyword/")))))
 
-(defvar shimbun-itmedia-server-name "ITmedia")
-(defvar shimbun-itmedia-from-address "webmaster@itmedia.co.jp")
 (defvar shimbun-itmedia-x-face-alist
-  '(("default" . "X-Face: %JzFW&0lP]xKGl{Bk3\\`yC0zZp|!;\\KT9'rqE2AIk\
+  '(("\\+D" . "X-Face: #Ur~tK`JhZFFHPEVGKEi`MS{55^~&^0KUuZ;]-@WQ[8\
+@,Ex'EeAAE}6xF<K#]pULF@5r24J
+ |8/oP)(lCAzF0}.C@@}!k8!Qiz6b{]V")
+    ("default" . "X-Face: %JzFW&0lP]xKGl{Bk3\\`yC0zZp|!;\\KT9'rqE2AIk\
 R[TQ[*i0d##D=I3|g`2yr@sc<pK1SB
  j`}1YEnKc;U0:^#LQB*})Q}y=45<lIE4q<gZ88e2qS8a@Tys6S")))
 
+(defvar shimbun-itmedia-content-start
+  "<div class=\"body-rap\">\\|<div id=\"wrIcon\">")
+(defvar shimbun-itmedia-content-end "<div class=\"credit-rap\">")
+
+(defvar shimbun-itmedia-retry-fetching 1)
+(defvar shimbun-itmedia-ignored-subject "^PR:")
+
+(luna-define-method initialize-instance :after ((shimbun shimbun-itmedia)
+						&rest init-args)
+  (shimbun-rss-initialize-ignored-subject shimbun))
+
 (luna-define-method shimbun-groups ((shimbun shimbun-itmedia))
   (mapcar 'car shimbun-itmedia-group-alist))
 
+(luna-define-method shimbun-from-address ((shimbun shimbun-itmedia))
+  (let ((group (shimbun-current-group-internal shimbun)))
+    (format "ITmedia (%s)"
+	    (or (nth 3 (assoc group shimbun-itmedia-group-alist)) group))))
+
 (luna-define-method shimbun-index-url ((shimbun shimbun-itmedia))
-  (concat
-   (shimbun-url-internal shimbun)
-   (nth 1 (assoc (shimbun-current-group-internal shimbun)
-		 shimbun-itmedia-group-alist))
-   "/"))
-
-(luna-define-method shimbun-get-headers ((shimbun shimbun-itmedia)
-					 &optional range)
-;;;<DEBUG>
-;;  (shimbun-itmedia-get-headers shimbun))
-;;
-;;(defun shimbun-itmedia-get-headers (shimbun)
-;;;</DEBUG>
-  (let* ((case-fold-search t)
-	 (group (shimbun-current-group-internal shimbun))
-	 (url-regexp (nth 2 (assoc group shimbun-itmedia-group-alist)))
-	 (time-regexp (nth 3 (assoc group shimbun-itmedia-group-alist)))
-	 (table '(("：" ":") ("［" "[") ("］" "]")))
-	 next headers)
-    (while (search-forward "\r" nil t)
-      (replace-match "\n"))
-    (goto-char (point-min))
-    (while (if next
+  (let ((def (assoc (shimbun-current-group-internal shimbun)
+		    shimbun-itmedia-group-alist)))
+    (or (nth 4 def)
+	(if (nth 1 def)
+	    (format "http://rss.itmedia.co.jp/rss/2.0/%s.xml" (nth 1 def))
+	  (format "http://plusd.itmedia.co.jp/lifestyle/column/%s.html"
+		  (nth 2 def))))))
+
+(luna-define-method shimbun-headers :around ((shimbun shimbun-itmedia)
+					     &optional range)
+  (if (string-match "\\.xml\\'" (shimbun-index-url shimbun))
+      ;; Use the function defined in sb-rss.el.
+      (luna-call-next-method)
+    ;; Use the default function defined in shimbun.el.
+    (funcall (intern "shimbun-headers"
+		     (luna-class-obarray (luna-find-class 'shimbun)))
+	     shimbun range)))
+
+(luna-define-method shimbun-get-headers :around ((shimbun shimbun-itmedia)
+						 &optional range)
+  (if (string-match "\\.xml\\'" (shimbun-index-url shimbun))
+      (luna-call-next-method)
+    (let ((case-fold-search t)
+	  (group (nth 2 (assoc (shimbun-current-group-internal shimbun)
+			       shimbun-itmedia-group-alist)))
+	  (from (shimbun-from-address shimbun))
+	  headers)
+      (goto-char (point-min))
+      (let ((regexp "\
+<!-+[\t\n ]*cms[\t\n /]+index\\(?:[\t\n ]+[^\t\n >-]+\\)?[\t\n ]*-+>[\t\n ]*"))
+	(when (re-search-forward regexp nil t)
+	  (delete-region (point-min) (match-end 0)))
+	(goto-char (point-max))
+	(when (re-search-backward regexp nil t)
+	  (delete-region (match-beginning 0) (point-max)))
+	(goto-char (point-min))
+	(setq regexp (if (string-equal group "kodera")
+			 "<a[\t\n ]+href=\"\\(http://\
+\\(?:plusd\\.itmedia\\|monoist\\.atmarkit\\)\\.co\\.jp/[^\"]+/articles/\
+\\([0-9][0-9]\\)\\([01][0-9]\\)/\\([0-3][0-9]\\)/news\\([0-9]+\\)\\.html\\)\
+\"[\t\n ]*>\\(?:[\t\n ]*\\|[\t\n ]*<strong>[\t\n ]*\\)\\([^<]+\\)"
+		       "<a[\t\n ]+href=\"\
+\\(\\(?:[^\"]+\\)?/\\(?:lifestyle\\|pcupdate\\)/articles/\
+\\([0-9][0-9]\\)\\([01][0-9]\\)/\\([0-3][0-9]\\)/news\\([0-9]+\\)\\.html\\)\
+\"[\t\n ]*>\\(?:[\t\n ]*\\|[\t\n ]*<strong>[\t\n ]*\\)\\([^<]+\\)"))
+	(while (re-search-forward regexp nil t)
+	  (push (shimbun-create-header
+		 0 (match-string 6) from
+		 (shimbun-make-date-string
+		  (+ (string-to-number (match-string 2)) 2000)
+		  (string-to-number (match-string 3))
+		  (string-to-number (match-string 4)))
+		 (concat
+		  "<20" (match-string 2) (match-string 3) (match-string 4)
+		  "." (match-string 5) "." group
+		  ".column.lifestyle@itmedia.shimbun.namazu.org>")
+		 "" 0 0
+		 (match-string 1))
+		headers)))
+      headers)))
+
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-itmedia)
+					    header url)
+  (goto-char (point-min))
+  (when (re-search-forward
+	 "<b><a href=\"\\([^\"]+\\)\">次のページ</a></b>\
+\\|<span id=\"next\"><a href=\"\\([^\"]+\\)\">次のページへ</a></span>" nil t)
+    (let ((next (or (match-string 1) (match-string 2))))
+      (prog1
+	  (shimbun-expand-url next url)
+	;; Remove navigation button.
+	(goto-char (point-min))
+	(when (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*id=\"notice\""
+				      nil t)
+		   (shimbun-end-of-tag "div" t)
+		   (save-match-data
+		     (re-search-backward (concat "[\t\n ]href=\""
+						 (regexp-quote next)
+						 "\"")
+					 (match-beginning 0) t)))
+	  (replace-match "\n"))))))
+
+(luna-define-method shimbun-multi-clear-contents ((shimbun shimbun-itmedia)
+						  header
+						  has-previous-page
+						  has-next-page)
+  (let (credit)
+    (when (and (not has-previous-page)
 	       (progn
-		 (set-match-data next)
-		 (setq next nil)
-		 (goto-char (match-end 0)))
-	     (re-search-forward url-regexp nil t))
-      (unless (string= "index" (match-string 7))
-	(let ((url (match-string 2))
-	      (year (+ 2000 (string-to-number (match-string 4))))
-	      (month (string-to-number (match-string 5)))
-	      (day (string-to-number (match-string 6)))
-	      (id (format "<%s%s%s%s%%%s>"
-			  (match-string 4)
-			  (match-string 5)
-			  (match-string 6)
-			  (match-string 7)
-			  group))
-	      (subject (mapconcat
-			(lambda (s)
-			  (dolist (e table s)
-			    (setq s (apply 'shimbun-replace-in-string s e))))
-			(delete
-			 ""
-			 (split-string
-			  (buffer-substring (match-end 0)
-					    (progn
-					      (search-forward "</A>" nil t)
-					      (point)))
-			  "[\t\n ]*<[^>]+>[\t\n ]*\\|[\t\n 　]+"))
-			" "))
-	      time)
-	  (unless (zerop (length subject))
-	    (setq subject (shimbun-replace-in-string
-			   subject " ?\\([“”（）「」]\\) ?" "\\1"))
-	    (when time-regexp
-	      (setq next (point)
-		    next (when (re-search-forward url-regexp nil t)
-			   (goto-char next)
-			   (match-data))
-		    time (when (re-search-forward time-regexp (car next) t)
-			   (match-string 1))))
-	    (push (shimbun-create-header
-		   0 subject
-		   (shimbun-from-address shimbun)
-		   (shimbun-make-date-string year month day time)
-		   id  "" 0 0
-		   (concat shimbun-itmedia-url url))
-		  headers)))))
-    (shimbun-sort-headers headers)))
-
-(defun shimbun-itmedia-clean-text-page ()
-  (let ((case-fold-search t) (start))
-    (goto-char (point-min))
-    (when (and (search-forward "<!--BODY-->" nil t)
-	       (setq start (match-end 0))
-	       (re-search-forward "<!--BODY ?END-->" nil t))
-      (delete-region (match-beginning 0) (point-max))
-      (delete-region (point-min) start)
-      ;; Remove anchors to both the next page and the previous page.
-      ;; These anchors are inserted into the head and the tail of the
-      ;; article body.
-      (skip-chars-backward " \t\r\f\n")
-      (forward-line 0)
-      (when (looking-at "<P ALIGN=\"CENTER\"><[AB]")
-	(delete-region (point) (point-max)))
+		 (goto-char (point-min))
+		 (re-search-forward "<!--■クレジット-->[\t\n ]*" nil t))
+	       (looking-at "<p\\( [^\n>]+>[^\n]+</\\)p>"))
+      (setq credit (match-string 1))
+      (when (string-match "<b>\\[ITmedia\\]</b>" credit)
+	(setq credit nil)))
+    (when (shimbun-clear-contents shimbun header)
+      (goto-char (point-min))
+      (when credit
+	(insert "<div" credit "div>\n"))
+      ;; Remove navigation buttons.
+      (while (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"ctrl\""
+				     nil t)
+		  (shimbun-end-of-tag "div" t)
+		  (save-match-data
+		    (re-search-backward "[次前]のページへ"
+					(match-beginning 0) t)))
+	(replace-match "\n"))
       (goto-char (point-min))
-      (skip-chars-forward " \t\r\f\n")
-      (when (looking-at "<P ALIGN=\"CENTER\"><[AB]")
-	(delete-region (point-min) (line-end-position))))
-    (shimbun-remove-tags "<!-- AD START -->" "<!-- AD END -->")
-    (shimbun-remove-tags "\
+      (when has-previous-page
+	(insert "&#012;") ;; ^L
+	;; Remove tags that likely cause a newline preceding a page.
+	(when (and (looking-at "[\t\n ]*<\\(h[0-9]+\\|p\\)[\t\n >]")
+		   (shimbun-end-of-tag (match-string 1) t))
+	  (replace-match "\n\\3\n")))
+      t)))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-itmedia)
+						    header)
+  (or (luna-call-next-method)
+      ;; Extract the article body and return t if successful.
+      (let ((case-fold-search t)
+	    start end md)
+	(goto-char (point-min))
+	(when (and (re-search-forward "<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+id=\"cms\\(?:Abstract\\|Byline\\|\\(Body\\)\\)\"" nil t)
+		   (progn
+		     (setq start (match-beginning 0))
+		     (or (match-beginning 1)
+			 (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*id=\"cmsBody\"" nil t)))
+		   (shimbun-end-of-tag "div" t))
+	  (setq end (match-end 1))
+	  (goto-char start)
+	  (delete-region (if (re-search-forward "[\t\n ]*<h[0-9]>[\t\n ]*関連"
+						end t)
+			     (match-beginning 0)
+			   end)
+			 (point-max))
+	  (delete-region (point-min) start)
+	  (goto-char (point-max))
+	  (insert "\n")
+	  (shimbun-remove-tags "<!-- ad_start_new -->" "<!-- ad_end_new -->")
+	  (shimbun-remove-tags "<!-- AD START -->" "<!-- AD END -->")
+	  (shimbun-remove-tags "\
 <IMG [^>]*SRC=\"http:/[^\"]*/\\(ad\\.itmedia\\.co\\.jp\\|\
 a1100\\.g\\.akamai\\.net\\)/[^>]+>")
-    (shimbun-remove-tags "\
+	  (shimbun-remove-tags "\
 <A [^>]*HREF=\"http:/[^\"]*/\\(ad\\.itmedia\\.co\\.jp\\|\
-a1100\\.g\\.akamai\\.net\\)/[^>]+>[^<]*</A>")))
+a1100\\.g\\.akamai\\.net\\)/[^>]+>[^<]*</A>")
 
-(defun shimbun-itmedia-retrieve-next-pages (shimbun base-cid url
-						    &optional images)
-  (let ((case-fold-search t) (next))
-    (goto-char (point-min))
-    (when (re-search-forward
-	   "<b><a href=\"\\([^\"]+\\)\">次のページ</a></b>" nil t)
-      (setq next (shimbun-expand-url (match-string 1) url)))
-    (shimbun-itmedia-clean-text-page)
-    (goto-char (point-min))
-    (insert "<html>\n<head>\n<base href=\"" url "\">\n</head>\n<body>\n")
-    (goto-char (point-max))
-    (insert "\n</body>\n</html>\n")
-    (when shimbun-encapsulate-images
-      (setq images (shimbun-mime-replace-image-tags base-cid url images)))
-    (let ((body (shimbun-make-text-entity "text/html" (buffer-string)))
-	  (result (when next
-		    (with-temp-buffer
-		      (shimbun-fetch-url shimbun next)
-		      (shimbun-itmedia-retrieve-next-pages shimbun base-cid
-							   next images)))))
-      (list (cons body (car result))
-	    (or (nth 1 result) images)))))
-
-(luna-define-method shimbun-make-contents ((shimbun shimbun-itmedia) header)
-  (let ((case-fold-search t))
-    (when (re-search-forward "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\) \
-\\([0-9]+:[0-9]+\\) 更新" nil t)
-      (shimbun-header-set-date
-       header
-       (shimbun-make-date-string
-	(string-to-number (match-string 1))
-	(string-to-number (match-string 2))
-	(string-to-number (match-string 3))
-	(match-string 4))))
-    (let ((base-cid (shimbun-header-id header)))
-      (when (string-match "\\`<\\([^>]+\\)>\\'" base-cid)
-	(setq base-cid (match-string 1 base-cid)))
-      (let (body)
-	(multiple-value-bind (texts images)
-	    (shimbun-itmedia-retrieve-next-pages shimbun base-cid
-						 (shimbun-header-xref header))
-	  (erase-buffer)
-	  (if (= (length texts) 1)
-	      (setq body (car texts))
-	    (setq body (shimbun-make-multipart-entity))
-	    (let ((i 0))
-	      (dolist (text texts)
-		(setf (shimbun-entity-cid text)
-		      (format "shimbun.%d.%s" (incf i) base-cid))))
-	    (apply 'shimbun-entity-add-child body texts))
-	  (when images
-	    (setf (shimbun-entity-cid body) (concat "shimbun.0." base-cid))
-	    (let ((new (shimbun-make-multipart-entity)))
-	      (shimbun-entity-add-child new body)
-	      (apply 'shimbun-entity-add-child new
-		     (mapcar 'cdr (nreverse images)))
-	      (setq body new))))
-	(shimbun-header-insert shimbun header)
-	(insert "MIME-Version: 1.0\n")
-	(shimbun-entity-insert body)))
-    (buffer-string)))
+	  ;; Insert line-break after images.
+	  (goto-char (point-min))
+	  (while (re-search-forward
+		  "\\(<img[\t\n ]+[^>]+>\\(?:[\t\n ]*<[^>]+>\\)*\\)[\t\n ]*"
+		  nil t)
+	    (when (or
+		   ;; Look forward for </a>.
+		   (progn
+		     (setq start (point)
+			   md (match-data))
+		     (and (re-search-forward "<a[\t\n ]+\\|\\(</a>\\)[\t\n ]*"
+					     nil t)
+			  (or (match-beginning 1)
+			      (progn
+				(goto-char start)
+				(set-match-data md)
+				nil))))
+		   ;; Look backward for </foo>.
+		   (re-search-backward "\\(</[^>]+>\\)[\t\n ]*"
+				       (match-beginning 1) t))
+	      (goto-char (match-end 0)))
+	    (unless
+		;; Check if there's a tag that is likely to cause
+		;; the line-break.
+		(looking-at "\\(?:<![^>]+>[\t\n ]*\\)*\
+<\\(?:br\\|div\\|h[0-9]+\\|p\\)\\(?:[\t\n ]*>\\|[\t\n ]\\)")
+	      (replace-match "\\1<br>\n")))
+	  (let ((hankaku (shimbun-japanese-hankaku shimbun)))
+	    (when (and hankaku (not (memq hankaku '(header subject))))
+	      (shimbun-japanese-hankaku-buffer t)))
+	  t))))
+
+(luna-define-method shimbun-make-contents :before ((shimbun shimbun-itmedia)
+						   header)
+  (when (re-search-forward "\\([0-9]+\\)年\\([0-9]+\\)月\\([0-9]+\\)日 \
+\\([0-9]+\\)時\\([0-9]+\\)分 更新" nil t)
+    (shimbun-header-set-date
+     header
+     (shimbun-make-date-string
+      (string-to-number (match-string 1))
+      (string-to-number (match-string 2))
+      (string-to-number (match-string 3))
+      (concat (match-string 4) ":" (match-string 5))))))
+
+(luna-define-method shimbun-footer :around ((shimbun shimbun-itmedia)
+					    header &optional html)
+  (if html
+      (concat "<div align=\"left\">\n--&nbsp;<br>\n\
+この記事の諸権利は&nbsp;ITmedia&nbsp;または情報の提供元に帰属します。<br>
+原物は<a href=\""
+	      (shimbun-article-base-url shimbun header)
+	      "\"><u>ここ</u></a>で公開されています。\n</div>\n")
+    (concat "-- \n\
+この記事の諸権利は ITmedia または情報の提供元に帰属します。\n\
+原物は以下の場所で公開されています:\n"
+	    (shimbun-article-base-url shimbun header) "\n")))
 
 (provide 'sb-itmedia)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-japantimes.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-japantimes.el
--- work/emacs-w3m-1.4.4/shimbun/sb-japantimes.el	2005-01-08 21:50:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-japantimes.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-japantimes.el --- shimbun backend for www.japantimes.co.jp
 
-;; Author: Hidetaka Iwai <tyuyu@mb6.seikyou.ne.jp>
+;; Author: Hidetaka Iwai <tyuyu@mb6.seikyou.ne.jp>,
+;;         KASUGA Toru <gen@qb3.so-net.ne.jp>
 
 ;; Keywords: news
 
@@ -17,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -29,86 +30,87 @@
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-japantimes (shimbun shimbun-text) ())
+(luna-define-class shimbun-japantimes (shimbun) ())
 
-(defvar shimbun-japantimes-url "http://www.japantimes.co.jp/")
+(defvar shimbun-japantimes-url
+  "http://www.japantimes.co.jp/")
 (defvar shimbun-japantimes-groups
   '("general" "business"))
-(defvar shimbun-japantimes-from-address "webmaster@japantimes.co.jp")
-(defvar shimbun-japantimes-content-start "</B></FONT><BR><BR>\n")
-(defvar shimbun-japantimes-content-end  "\n<! ---- PAGE FOOTER ---->\n")
-
-(defvar shimbun-japantimes-group-path-alist
-  '(("general" . "news.htm")
-    ("business" . "business.htm")))
+(defvar shimbun-japantimes-from-address
+  "webmaster@japantimes.co.jp")
+(defvar shimbun-japantimes-content-start
+  "<div id=\"deck\">\\|<div id=\"mainbody\">")
+(defvar shimbun-japantimes-content-end
+  "^</div>")
+
+(defvar shimbun-japantimes-group-table
+  '(("general" "news.htm" "nn")
+    ("business" "news.htm" "nb")))
 (defvar shimbun-japantimes-expiration-days 7)
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-japantimes))
   (concat (shimbun-url-internal shimbun)
-	  (cdr (assoc (shimbun-current-group-internal shimbun)
-		      shimbun-japantimes-group-path-alist))))
+	  (nth 1 (assoc (shimbun-current-group-internal shimbun)
+			shimbun-japantimes-group-table))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-japantimes)
 					 &optional range)
-  (let ((case-fold-search t) headers)
+  (let ((regexp
+	 (format
+	  (eval-when-compile
+	    (let ((s0 "[\t\n ]*")
+		  (s1 "[\t\n ]+"))
+	      (concat "<a href=\""
+		      ;; 1. url
+		      "\\(http://search.japantimes.co.jp/cgi-bin/"
+		      ;; 2.
+		      "\\(%s\\)"
+		      ;; 3. year
+		      "\\(20[0-9][0-9]\\)"
+		      s0
+		      ;; 4. month
+		      "\\([0-1][0-9]\\)"
+		      s0
+		      ;; 5. day
+		      "\\([0-3][0-9]\\)"
+		      s0
+		      ;; 6. tag
+		      "\\([a-z][0-9]\\)"
+		      s0 "\\.html\\)\">"
+		      ;; 7. subject
+		      s0 "\\([^[<>]+\\)"
+		      s0 "</a>")))
+	  (nth 2 (assoc (shimbun-current-group-internal shimbun)
+			shimbun-japantimes-group-table))))
+	(case-fold-search t)
+	url serial year month day tag subject id date headers)
     (goto-char (point-min))
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<A HREF=\""
-			;; 1. url
-			"\\(cgi-bin/getarticle\\.pl5\\?"
-			;; 2.
-			"\\(n[bn]\\)"
-			;; 3. year
-			"\\(20[0-9][0-9]\\)"
-			s0
-			;;4. month
-			"\\([0-1][0-9]\\)"
-			s0
-			;; 5. day
-			"\\([0-3][0-9]\\)"
-			s0
-			;; 6. tag
-			"\\(a[0-9]\\)"
-			s0 "\\.htm\\)\">" s0
-			;; 7
-			s0 "<IMG BORDER=\\([\"]?0[\"]?\\)" s1
-			"HEIGHT=\"[0-9]+\"" s1
-			"WIDTH=\"[0-9]+\"" s1
-			"SRC=\"img/gray.gif\">" s1
-			"<FONT CLASS=\"otherhead" s0
-			"\\([3]?\\)\">" s0
-			;; 9. subject
-			"\\([^[<>]+\\)"
-			"</FONT></A><BR>")))
-	    nil t)
-      (let* ((url (match-string 1))
-	     (serial (match-string 2))
-	     (year (match-string 3))
-	     (month (match-string 4))
-	     (day (match-string 5))
-	     (tag (match-string 6))
-	     (subject (match-string 9))
-	     id date)
-	(setq id (format "<%s%s%s%s%s%%%s.japantimes.co.jp>"
-			 serial year month day tag
-			 (shimbun-current-group-internal shimbun)))
-	(setq date (shimbun-make-date-string
-		    (string-to-number year)
-		    (string-to-number month)
-		    (string-to-number day)))
-	(push (shimbun-make-header
-	       0
-	       (shimbun-mime-encode-string subject)
-	       (shimbun-from-address shimbun)
-	       date id "" 0 0 (concat
-			       (shimbun-url-internal shimbun)
-			       url))
-	      headers)))
+    (while (re-search-forward regexp nil t)
+      (setq url (match-string 1)
+	    serial (match-string 2)
+	    year (match-string 3)
+	    month (match-string 4)
+	    day (match-string 5)
+	    tag (match-string 6)
+	    subject (match-string 7)
+	    id (format "<%s%s%s%s%s%%%s.japantimes.co.jp>"
+		       serial
+		       year
+		       month
+		       day
+		       tag
+		       (shimbun-current-group-internal shimbun))
+	    date (shimbun-make-date-string
+		  (string-to-number year)
+		  (string-to-number month)
+		  (string-to-number day)))
+      (push (shimbun-make-header
+	     0
+	     (shimbun-mime-encode-string subject)
+	     (shimbun-from-address shimbun)
+	     date id "" 0 0 url)
+	    headers))
     headers))
 
 (provide 'sb-japantimes)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-javaconf.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-javaconf.el
--- work/emacs-w3m-1.4.4/shimbun/sb-javaconf.el	2005-03-14 07:25:36.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-javaconf.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-javaconf.el --- shimbun backend class for java-conference archive.
 
-;; Copyright (C) 2001, 2002, 2003, 2004 ABE Yasushi <yasushi@stbbs.net>
+;; Copyright (C) 2001, 2002, 2003, 2004, 2007 ABE Yasushi <yasushi@stbbs.net>
 
 ;; Author: ABE Yasushi <yasushi@stbbs.net>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -43,10 +43,10 @@
   "<strong><a NAME=\"\\([0-9]+\\)\" HREF=\"\\(msg[0-9]+\.html\\)\">\\([^<]+\\)\n</a></strong> <em>\\([^<]+\\)\n</em>")
 
 (defmacro shimbun-javaconf-concat-url (shimbun url)
-  (` (concat (shimbun-url-internal (, shimbun))
-	     (shimbun-current-group-internal shimbun)
-	     "/"
-	     (, url))))
+  `(concat (shimbun-url-internal ,shimbun)
+	   (shimbun-current-group-internal ,shimbun)
+	   "/"
+	   ,url))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-javaconf)
 					 &optional range)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-jpilot.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-jpilot.el
--- work/emacs-w3m-1.4.4/shimbun/sb-jpilot.el	2005-03-14 07:25:42.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-jpilot.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-jpo.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-jpo.el
--- work/emacs-w3m-1.4.4/shimbun/sb-jpo.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-jpo.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 ;;
@@ -54,9 +54,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 
 (luna-define-class shimbun-jpo (shimbun) ())
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-kantei.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-kantei.el
--- work/emacs-w3m-1.4.4/shimbun/sb-kantei.el	2004-10-05 08:42:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-kantei.el	2012-04-12 16:45:16.000000000 +0900
@@ -1,6 +1,6 @@
-;;; sb-kantei.el --- shimbun backend for kantei mail magazine backnumber -*- coding: iso-2022-7bit; -*-
+;;; sb-kantei.el --- shimbun backend for kantei blog backnumber -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2003, 2003, 2004 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001-2012 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -31,94 +31,527 @@
 (luna-define-class shimbun-kantei (shimbun) ())
 
 (defvar shimbun-kantei-url "http://www.kantei.go.jp/")
-(defvar shimbun-kantei-from-address "koizumi@mmz.kantei.go.jp")
 
-(defvar shimbun-kantei-groups '("m-magazine-en" "m-magazine-ja" "m-magazine")
-  "List of groups of the Koizumi cabinet email magazine.
-Note that the `m-magazine-ja' is the same as `m-magazine' which is for
-the backward compatibility.")
-
-(defvar shimbun-kantei-content-start
-  "<!-- CONTENT -->\\|<PRE>")
-(defvar shimbun-kantei-content-end
-  "\\(<!-- /CONTENT -->\\)\\|\\(</PRE>\\)\n</FONT>\n</TD></TR></TABLE>")
+(defvar shimbun-kantei-groups '("blog-en"
+				"blog-ja"
+				"blog-en.kan"
+				"blog-ja.kan"
+				"m-magazine-cn.hatoyama"
+				"m-magazine-kr.hatoyama"
+				"m-magazine-en.hatoyama"
+				"m-magazine-ja.hatoyama"
+				"m-magazine-en.aso"
+				"m-magazine-ja.aso"
+				"m-magazine-en.fukuda"
+				"m-magazine-ja.fukuda"
+				"m-magazine-en.abe"
+				"m-magazine-ja.abe"
+				"m-magazine-en.koizumi"
+				"m-magazine-ja.koizumi"
+				;; Backward compatibility.
+				"m-magazine")
+  "List of the groups subscribing to the blog of Japan's Cabinet.
+Old e-mail magazines' archive are also supported.
+Note that the `m-magazine-ja.koizumi' is the same as `m-magazine'
+which is for the backward compatibility.")
+
 (defvar shimbun-kantei-x-face-alist
-  '(("default" . "X-Face: .bsmj'!8A`wI\\o+KF!)#0.a0,f1MA~PH/5T0\
-fu$Mg+)_5G~NSk4.0t]&|f@^c3l8-Fuz8'|\n kr;td_Jn7|GwREbDs'H9$Iy#y\
-M#*J2c'L},(m8K:8?$vTPC%D}YJ[bV#7xw|{\"DJ:_?`V1m_4^+;7+\n JOf6v&\
-x6?mU-q=0}mTK5@\"-bFGuD}2Y/(lR/V#'?HRc2Jh2UrR,oIR~NL!})|^%kw")))
+  ;; Don't change the order of the faces.  See the method function that
+  ;; is applied to `shimbun-make-contents'.
+  '(("default" . "X-Face: )y>~@`/54G8A3vhuan6E%su\\r]&ACV[`\"4|_2e\"!\
+KcK5c8:G'\"C6<;7ovb1YWG4B%BY?:^r\n p[nt=j!$4c:Buz#]][;-i&P66^9aC<Hd>\
+\\CtF^uD20*Y9SqW'lFN,mTLp[\"0`9Z?bS,BJ-CaA@a||]\n Oe]\";W)D3whpcUo(?a\
+&S|i=u\"r>{N9/GRtw'OC2W9M%5t_>")
+    ("\\.kan\\'" . "X-Face: #Mk`n~UfLBs/5u+Pl'tnaO~4.\";)nt-Ip-+H&X}D\
+u!TN~u*]-#PJ(Xo'uKzpq-l]6pac=~T\n hm-vH$Bh88Kq<[!1tY7\\wVW{fV=9ad4!`|\
+xnRw$tl:?a{01+wd:6ysB*[Mms:Gv%\\Dj-a<{MY{vKJK\n /*t91Ighysyc8}Z2NG#X]\
+W9fUoRI<7zrQw")
+    ("\\.hatoyama\\'" . "X-Face: Bhu:2dJ9#&[pX@hMRh=$pF|<M}p@,Fe{2SAS\
+)tupW4jk^RavhwxRqDm>O>-,*d\"V+@u\"gB5\n ]}Yxh$n#S1BM<uz\\n|sXtBh\"1TH\
+|g@:n,M4A7Cr8,MO$L-KmDmX&~)G+W:6gN0?c:5&o=JAJF6b7%_\n A{A`1-=;*q;RtW>\
+o,8|XYsIrL4grl\\|6JV<A.,@%,RI\"v^EIY_[<>6fq3!B`28KP2,M/.Tsh")
+    ("\\.aso\\'" . "X-Face: #(b'i|jCr9M1k*o`B1YbD.C*%\\T3~.mUK@q?}o4.\
+TC*~*~fPaHg\\]V+Q2$3wu$=:[<k^Y<s\n X{VB1rZN[(X$(Cej@QV?FaoslWKi,fxp\"\
+m\\<Cb#4vo!!hDZI@9I8gAMMp6>HZ'C/&9e15i*4e>OV4`\n pdAVvpz`w<$QCu9'~:}|\
+h`SEZv\\U]f']V(QbE5'%u$InJltT4~|Ru\\vs~g!;y;1uY#8v<8|eGbb*i=\n a/RM<?\
+`*?5`AL1#G(9F50D}`>Y:'\"^)0:;L!2x8j|br~q/E=j.s!FBI-6xr")
+    ("\\.fukuda\\'" . "X-Face: R![ems6?kedF&(},`\";7nbUIT6Uyt2A9jSQ'\\\
+$=;,n.9<lIS+DFBTdMEJ$nh0[t)XU!.D*p\n kd~cuh0/nvCm;1~B;Ib!g^TC*OHm5(<Z\
+%=A2H_,kDt0E*HaI&^C%Wzb/EC_PF1f!jk7VHf=s*mqe91\n `H.J(Bq9(S'71?$O\\+=\
+Kp\"yNww;MOGO&N+tm<MbYT}Mlh4<hahJgCV`P/<&9Fm|FRmb>vM+PFYQB}O\n <Se")
+    ("\\.abe\\'" . "X-Face: 2lqMN=orK#d]Xl-K5P`=ApJHMB3[faCtca;G(i=qL\
+^3qh<kEoLHF\"L\"x/a:|xD>x=IKEqN%\n 3EL93@D{*BW-{GE88b7{d^m-%v9}=-7=^M\
+#$?zJm$]Yy07J^}:#V?9t_<{fhavZVZQ1^1=SLQf3X=<\n z|Af_njD},U!m}4V}$]L_7\
+a!b>X!RW$['xZs$r=G?o|=M^O)IJoOurt|UKUu[UuQFT/r&vygySYUmf\n <G6B:zwx0@\
+$xHbD#Hr3`J,C!5rN5t7oI)ng/'e40?>Jm;kjj")
+    ("\\.koizumi\\'\\|\\`m-magazine\\'" . "X-Face: .bsmj'!8A`wI\\o+KF\
+!)#0.a0,f1MA~PH/5T0fu$Mg+)_5G~NSk4.0t]&|f@^c3l8-Fuz8'|\n kr;td_Jn7|Gw\
+REbDs'H9$Iy#yM#*J2c'L},(m8K:8?$vTPC%D}YJ[bV#7xw|{\"DJ:_?`V1m_4^+;7+\n\
+ JOf6v&x6?mU-q=0}mTK5@\"-bFGuD}2Y/(lR/V#'?HRc2Jh2UrR,oIR~NL!})|^%kw")))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-kantei))
-  (let ((group (shimbun-current-group-internal shimbun)))
-    (concat (shimbun-url-internal shimbun)
-	    (cond ((string-equal group "m-magazine-en")
-		   "foreign/m-magazine")
-		  ((string-equal group "m-magazine") ;; Backward compatibility.
-		   "jp/m-magazine")
-		  (t
-		   "jp/m-magazine"))
-	    "/backnumber/")))
+  (let* ((group (shimbun-current-group-internal shimbun))
+	 (url (cond ((string-equal group "blog-en")
+		     "http://nodasblog.kantei.go.jp/")
+		    ((string-equal group "blog-ja")
+		     "http://kawaraban.kantei.go.jp/")
+		    ((string-equal group "blog-en.kan")
+		     "http://kansblog.kantei.go.jp/archives.html")
+		    ((string-equal group "blog-ja.kan")
+		     "http://kanfullblog.kantei.go.jp/archives.html")
+		    ((string-equal group "m-magazine-cn.hatoyama")
+		     "http://www.mmz.kantei.go.jp/\
+foreign/m-magazine/backnumber_ch/hatoyama_index.html")
+		    ((string-equal group "m-magazine-kr.hatoyama")
+		     "http://www.mmz.kantei.go.jp/\
+foreign/m-magazine/backnumber_ko/hatoyama_index.html")
+		    ((string-equal group "m-magazine-en.hatoyama")
+		     "http://www.mmz.kantei.go.jp/\
+foreign/m-magazine/backnumber/hatoyama.html")
+		    ((string-equal group "m-magazine-ja.hatoyama")
+		     "http://www.mmz.kantei.go.jp/\
+jp/m-magazine/backnumber/hatoyama.html")
+		    ((string-equal group "m-magazine-en.aso")
+		     "http://www.mmz.kantei.go.jp/\
+foreign/m-magazine/backnumber/aso.html")
+		    ((string-equal group "m-magazine-ja.aso")
+		     "http://www.mmz.kantei.go.jp/\
+jp/m-magazine/backnumber/aso.html")
+		    ((string-equal group "m-magazine-en.fukuda")
+		     "http://www.mmz.kantei.go.jp/\
+foreign/m-magazine/backnumber/fukuda.html")
+		    ((string-equal group "m-magazine-ja.fukuda")
+		     "http://www.mmz.kantei.go.jp/\
+jp/m-magazine/backnumber/hukuda.html")
+		    ((string-equal group "m-magazine-en.abe")
+		     "foreign/m-magazine/backnumber/abe.html")
+		    ((string-equal group "m-magazine-ja.abe")
+		     "jp/m-magazine/backnumber/abe.html")
+		    ((string-equal group "m-magazine-en.koizumi")
+		     "foreign/m-magazine/backnumber/koizumi.html")
+		    ((string-equal group "m-magazine-ja.koizumi")
+		     "jp/m-magazine/backnumber/koizumi.html")
+		    ;; Backward compatibility.
+		    ((string-equal group "m-magazine")
+		     "jp/m-magazine/backnumber/koizumi.html")
+		    ;; Default.
+		    (t
+		     "jp/m-magazine/backnumber/"))))
+    (cond ((string-match "\\`blog-\\(?:en\\|ja\\)\\'" group)
+	   (concat url (format-time-string "%Y/%02m/")))
+	  ((string-match "\\`http:" url)
+	   url)
+	  (t
+	   (concat (shimbun-url-internal shimbun) url)))))
 
 (luna-define-method shimbun-from-address ((shimbun shimbun-kantei))
-  (format "%s <%s>"
-	  (shimbun-mime-encode-string
-	   (if (string-equal (shimbun-current-group-internal shimbun)
-			     "m-magazine-en")
-	       "Official Residence"
-	     "首相官邸"))
-	  (shimbun-from-address-internal shimbun)))
+  (let ((group (shimbun-current-group-internal shimbun)))
+    (cond ((string-equal group "blog-en")
+	   "Yoshihiko Noda")
+	  ((string-equal group "blog-ja")
+	   "野田佳彦")
+	  ((string-equal group "blog-en.kan")
+	   "Naoto Kan")
+	  ((string-equal group "blog-ja.kan")
+	   "菅直人")
+	  ((string-equal group "m-magazine-cn.hatoyama")
+	   "�p/山由�射夫")
+	  ((string-equal group "m-magazine-kr.hatoyama")
+	   "�GOEd>_86 �@/E0?@")
+	  ((string-equal group "m-magazine-en.hatoyama")
+	   "Yukio Hatoyama")
+	  ((string-equal group "m-magazine-ja.hatoyama")
+	   "鳩山由紀夫")
+	  ((string-equal group "m-magazine-en.aso")
+	   "Taro Aso")
+	  ((string-equal group "m-magazine-ja.aso")
+	   "麻生太郎")
+	  ((string-equal group "m-magazine-en.fukuda")
+	   "Yasuo Fukuda")
+	  ((string-equal group "m-magazine-ja.fukuda")
+	   "福田康夫")
+	  ((string-equal group "m-magazine-en.abe")
+	   "Shinzo Abe")
+	  ((string-equal group "m-magazine-ja.abe")
+	   "安倍晋三")
+	  ((string-equal group "m-magazine-en.koizumi")
+	   "Junichiro Koizumi")
+	  ((string-equal group "m-magazine-ja.koizumi")
+	   "小泉純一郎")
+	  ((string-equal group "m-magazine") ;; Backward compatibility.
+	   "小泉純一郎")
+	  (t
+	   "野田佳彦"))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-kantei)
 					 &optional range)
-  (let (year month mday id url subject headers)
-    (while (re-search-forward
-	    ;; 1. url
-	    ;; 3. year (ja)
-	    ;; 4. month (ja)
-	    ;; 5. mday (ja)
-	    ;; 6. month (en)
-	    ;; 7. mday (en)
-	    ;; 8. year (en)
-	    ;; 9. subject
-	    "\
-<A HREF=\"\\([^\">]+\\)\">\
-\\(\
-【\\(20[0-9][0-9]\\)/\\([01][0-9]\\)/\\([0-3][0-9]\\)】\
-\\|\
-\\[\\([01][0-9]\\)/\\([0-3][0-9]\\)/\\(20[0-9][0-9]\\)\\]\
-\\)\
-\[\t ]*\\([^<]+\\)"
-	    nil t)
-      (setq year (string-to-number (or (match-string 3) (match-string 8)))
-	    month (string-to-number (or (match-string 4) (match-string 6)))
-	    mday (string-to-number (or (match-string 5) (match-string 7)))
-	    url (match-string 1)
-	    id (format "<%d%02d%02d%s@www.kantei.or.jp>"
-		       year month mday
-		       (shimbun-current-group-internal shimbun))
-	    subject (match-string 9))
-      (push (shimbun-create-header
-	     0
-	     (or subject "")
-	     (shimbun-from-address shimbun)
-	     (shimbun-make-date-string year month mday)
-	     id "" 0 0
-	     (if (string-match "\\`http:" url)
-		 url
-	       (concat (shimbun-index-url shimbun) url)))
-	    headers))
-    headers))
-
-(luna-define-method shimbun-clear-contents ((shimbun shimbun-kantei) header)
-  (let ((case-fold-search t) start)
-    (when (and (re-search-forward (shimbun-content-start-internal shimbun)
-				  nil t)
+  (let* ((group (shimbun-current-group-internal shimbun))
+	 (enp (string-match "\\`m-magazine-en" group))
+	 (cnp (string-match "\\`m-magazine-cn" group))
+	 (krp (string-match "\\`m-magazine-kr" group))
+	 (regexp
+	  (cond
+	   ((string-equal group "blog-en")
+	    (eval-when-compile
+	      (concat "<a[\t\n ]+href=\""
+		      ;; 1. url
+		      "\\(https?://[^/]*kantei\\.go\\.jp/\\(?:[^/]+/\\)*"
+		      ;; 2. year
+		      "\\(20[1-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01]?[0-9]\\)"
+		      "/\\(?:\\(?:\\(?:20\\)?[1-9][0-9]\\)?[0-3][0-9]\\)?"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)[a-z]*"
+		      ;; 5. revision
+		      "[_-]?\\([0-9]+\\)?"
+		      "\\.html\\)"
+		      "\"[^>]*>[\t\n ]*"
+		      ;; 6. subject
+		      "\\(\\(?:\\(?:[^<]*</?[biu]>\\)+[^<]*\\)\\|[^<]+\\)")))
+	   ((string-equal group "blog-ja")
+	    (eval-when-compile
+	      (concat "<a[\t\n ]+href=\""
+		      ;; 1. url
+		      "\\(https?://[^/]*kantei\\.go\\.jp/\\(?:[^/]+/\\)*"
+		      ;; 2. year
+		      "\\(20[1-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01]?[0-9]\\)"
+		      "/"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)[a-z]*"
+		      ;; 5. revision
+		      "[_-]?\\([0-9]+\\)?"
+		      "\\.html\\)"
+		      "\"[^>]*>[\t\n ]*"
+		      ;; 6. subject
+		      "\\([^<]+\\)")))
+	   (enp
+	    (eval-when-compile
+	      (concat "<A[\t\n ]+HREF=\""
+		      ;; 1. url
+		      "\\(\\(?:[a-z]+/\\)?"
+		      ;; 2. year
+		      "\\(20[0-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01][0-9]\\)"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)"
+		      "\\.html\\)\"[^>]*>[\t\n ]*"
+		      ;; 5. subject
+		      "\\(\\(?:[^\t\n <]+[\t\n ]+\\)*[^\t\n <]+\\)"
+		      "[\t\n ]*</A>[\t\n ]*</TD>[\t\n ]*</TR>")))
+	   (cnp
+	    (eval-when-compile
+	      (concat "<a[\t\n ]+href=\""
+		      ;; 1. url
+		      "\\(\\(?:/foreign/m-magazine/backnumber_ch/\\)?"
+		      ;; 2. year
+		      "\\(20[0-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01][0-9]\\)"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)"
+		      "\\.html\\)\"[^>]*>[\t\n ]*"
+		      ;; 5. subject
+		      "\\(\\(?:[^\t\n <]+[\t\n ]+\\)*[^\t\n <]+\\)"
+		      "[\t\n ]*</a>[\t\n ]*</td>[\t\n ]*</tr>")))
+	   (krp
+	    (eval-when-compile
+	      (concat "<a[\t\n ]+href=\""
+		      ;; 1. url
+		      "\\(\\(?:/foreign/m-magazine/backnumber_ko/\\)?"
+		      ;; 2. year
+		      "\\(20[0-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01][0-9]\\)"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)"
+		      "\\.html\\)\"[^>]*>[\t\n ]*"
+		      ;; 5. subject
+		      "\\(\\(?:[^\t\n <]+[\t\n ]+\\)*[^\t\n <]+\\)"
+		      "[\t\n ]*</a>[\t\n ]*</td>[\t\n ]*</tr>")))
+	   (t
+	    (eval-when-compile
+	      (concat "<A[\t\n ]+HREF=\""
+		      ;; 1. url
+		      "\\(\\(?:/jp/m-magazine/backnumber/\\)?"
+		      ;; 2. year
+		      "\\(20[0-9][0-9]\\)"
+		      "/"
+		      ;; 3. month
+		      "\\([01][0-9]\\)"
+		      ;; 4. day of month
+		      "\\([0-3][0-9]\\)"
+		      ;; 5. revision e.g., 2005/0602b.html
+		      "\\([^.]+\\)?"
+		      "\\.html\\)"
+		      "\"[^>]*>[\t\n ]*【[^】]+】[\t\n ]*"
+		      ;; 6. subject
+		      "\\([^<]+\\)")))))
+	 (parent (shimbun-index-url shimbun))
+	 (murl parent)
+	 (from (shimbun-from-address shimbun))
+	 unreads time year month mday url subject rev id prev headers)
+    (catch 'stop
+      (while t
+	;; Remove commented areas.
+	(while (re-search-forward "<!-+" nil t)
+	  (when (shimbun-end-of-tag nil t)
+	    (replace-match "\n")))
+	(goto-char (point-min))
+	(while (re-search-forward regexp nil t)
+	  (setq time nil)
+	  (if (or enp cnp krp)
+	      (setq year (string-to-number (match-string 2))
+		    month (string-to-number (match-string 3))
+		    mday (string-to-number (match-string 4))
+		    url (match-string 1)
+		    subject (match-string 5)
+		    id (format "<%d%02d%02d.%s%%kantei.go.jp>"
+			       year month mday group))
+	    (setq year (string-to-number (match-string 2))
+		  month (string-to-number (match-string 3))
+		  mday (string-to-number (match-string 4))
+		  url (match-string 1)
+		  subject (shimbun-replace-in-string (match-string 6)
+						     "[\t\n 　]+" " ")
+		  rev (match-string 5))
+	    (if (and (member group '("blog-en" "blog-ja"))
+		     (prog2
+			 (setq prev (match-end 0))
+			 (re-search-forward "\
+<span[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)?class=\"time\"[^>]*>\
+\\(\\([012]?[0-9]\\):\\([0-5]?[0-9]\\)\\)" nil t)
+		       (goto-char prev)))
+		(setq time (match-string 1)
+		      id (format "<%d%02d%02d%02d%02d%s.%s%%kantei.go.jp>"
+				 year month mday
+				 (string-to-number (match-string 2))
+				 (string-to-number (match-string 3))
+				 (if rev (concat "-" rev) "")
+				 group))
+	      (setq id (format "<%d%02d%02d%s.%s%%kantei.go.jp>"
+			       year month mday (or rev "") group))))
+	  (unless (and (string-match "\\`blog-\\(?:en\\|ja\\)\\'" group)
+		       (shimbun-search-id shimbun id))
+	    (push (shimbun-create-header
+		   0 subject from
+		   (shimbun-make-date-string year month mday time)
+		   id "" 0 0
+		   (if (string-match "\\`http:" url)
+		       url
+		     (shimbun-expand-url url parent)))
+		  unreads)))
+	(if unreads
+	    (setq headers (nconc unreads headers)
+		  unreads nil)
+	  (throw 'stop nil))
+	(if (string-match "\\`blog-\\(?:en\\|ja\\)\\'" group)
+	    (if (string-match "/\\(20[1-9][0-9]\\)/\\([01][0-9]\\)/\\'" murl)
+		(progn
+		  (setq year (string-to-number (match-string 1 murl))
+			month (1- (string-to-number (match-string 2 murl))))
+		  (when (<= month 0)
+		    (setq month 12
+			  year (1- year)))
+		  (if (and (= year 2011) (< month 9))
+		      (throw 'stop nil)
+		    (setq murl (format "%s/%d/%02d/"
+				       (substring murl 0 (match-beginning 0))
+				       year month))
+		    (erase-buffer)
+		    (shimbun-retrieve-url murl)))
+	      (throw 'stop nil))
+	  (throw 'stop nil))))
+    (shimbun-sort-headers headers)))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-kantei)
+						    header)
+  (let ((case-fold-search t)
+	(group (shimbun-current-group-internal shimbun))
+	start end section)
+    (if (and (search-forward "<pre>" nil t)
+	     (progn
 	       (setq start (match-beginning 0))
-	       (re-search-forward (shimbun-content-end-internal shimbun)
-				  nil t))
-      (delete-region (or (match-end 1) (match-end 2)) (point-max))
-      (delete-region (point-min) start)
-      t)))
+	       (goto-char (point-max))
+	       (search-backward "</pre>" nil t)))
+	(progn
+	  (delete-region (match-end 0) (point-max))
+	  (insert "\n")
+	  (delete-region (point-min) start)
+	  t)
+      (if (re-search-forward "<!-+[\t\n ]*content[\t\n ]*-+>[\t\n ]*\
+\\(?:<[^>]+>[\t\n ]*\\)*"
+			     nil t)
+	  (progn
+	    (setq start (match-end 0))
+	    (re-search-forward "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+\\(?:<a[\t\n ]+href=\"#[^>]+>[\t\n ]*\
+go[\t\n ]+to[\t\n ]+top[\t\n ]+of[\t\n ]+the[\t\n ]+page[\t\n ]*</a>\
+\\|<a[\t\n ]*href=\"[^>]+>[\t\n ]*subscription[\t\n ]*</a>\
+\\|<!-+[\t\n ]*/content[\t\n ]*-+>\\)"
+			       nil t)
+	    (delete-region (match-beginning 0) (point-max))
+	    (insert "\n")
+	    (delete-region (point-min) start)))
+      (goto-char (point-min))
+      (if (and (re-search-forward "<!--\\(\\cj+\\)-->[\t\n ]*" nil t)
+	       (progn
+		 (setq section (regexp-quote (match-string 1))
+		       start (match-end 0))
+		 (re-search-forward (concat "\[\t\n ]*<!--/" section
+					    "\\(?:から\\)?-->")
+				    nil t)))
+	  (progn
+	    (setq end (match-beginning 0))
+	    (while (when (re-search-forward "<!--\\(\\cj+\\)-->[\t\n ]*" nil t)
+		     (setq section (regexp-quote (match-string 1)))
+		     (delete-region end (match-end 0))
+		     (insert "\n&#012;\n")
+		     (and (re-search-forward (concat "\[\t\n ]*<!--/" section
+						     "\\(?:から\\)?-->")
+					     nil t)
+			  (setq end (match-beginning 0)))))
+	    (if (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*align=\"center\"" nil t)
+		     (shimbun-end-of-tag "div" t))
+		(progn
+		  (delete-region (match-end 1) (point-max))
+		  (insert "\n")
+		  (goto-char end)
+		  (delete-region end (match-beginning 3))
+		  (insert "\n<div align=\"left\">\n--&nbsp;<br>\n"))
+	      (delete-region end (point-max))
+	      (insert "\n"))
+	    (delete-region (point-min) start))
+	;; Remove style sheet.
+	(shimbun-remove-tags "style" t)
+	;; Remove navigation button.
+	(shimbun-remove-tags "\\(td\\|span\\)\
+\\(?:[\t\n ]+[^\t\n >]+\\)*[\t\n ]+class=\"breadcrumbs\"" t))
+      ;; Remove useless tags.
+      (goto-char (point-min))
+      (while (re-search-forward "[\t\n ]*</tr>[\t\n ]*" nil t)
+	(replace-match "<br>\n"))
+      (goto-char (point-min))
+      (while (re-search-forward "\
+\[\t\n ]*</?\\(?:hr\\|span\\|table\\|td\\|tr\\)\\(?:[\t\n ]+[^>]+\\)?>[\t\n ]*"
+				nil t)
+	(replace-match "\n"))
+      (goto-char (point-min))
+      (while (re-search-forward "[\t\n ]*<p[\t\n ]+[^>]+>[\t\n ]*" nil t)
+	(replace-match "\n<p>"))
+      (goto-char (point-min))
+      (while (re-search-forward "[\t\n ]*<![^>]+>[\t\n ]*" nil t)
+	(replace-match "\n"))
+      (goto-char (point-min))
+      (while (re-search-forward "^[\t 　]+\n" nil t)
+	(delete-region (match-beginning 0) (match-end 0)))
+      (goto-char (point-min))
+      (while (re-search-forward "\\([\t\n ]*<br\\(?:[\t\n ]+[^>]*\\)?>\\)\
+\\(?:[\t\n ]*<br\\(?:[\t\n ]+[^>]*\\)?>\\)+[\t\n ]*\\(<br[\t\n >]\\)" nil t)
+	(replace-match "\\1\\2"))
+      (goto-char (point-min))
+      (skip-chars-forward "\t\n ")
+      (delete-region (point-min) (point))
+      (while (re-search-forward "[\t\n ]+\n" nil t)
+	(replace-match "\n"))
+      ;; Insert newlines around images.
+      (goto-char (point-min))
+      (while (re-search-forward "[\t\n ]*\\(\\(?:<[^/][>]+>[\t\n ]*\\)*\
+<img[\t\n ]+[^>]+>\\(?:[\t\n ]*<[^/][>]+>\\)*\\)[\t\n ]*" nil t)
+	(replace-match "<br>\n\\1<br>\n"))
+      ;; Shrink boundary lines.
+      (let ((limit (w3m-static-if (featurep 'xemacs)
+		       (when (device-on-window-system-p)
+			 (font-width (face-font 'default)))
+		     (when window-system
+		       (frame-char-width)))))
+	(when limit
+	  (setq limit (* limit (1- (window-width))))
+	  (goto-char (point-min))
+	  (while (re-search-forward
+		  "<img\\(?:[\t\n ]+[^\t\n >]+\\)*[\t\n ]+height=\"1\""
+		  nil t)
+	    (when (shimbun-end-of-tag)
+	      (goto-char (match-beginning 0))
+	      (if (re-search-forward "width=\"\\([0-9]+\\)\"" (match-end 0) t)
+		  (when (> (string-to-number (match-string 1)) limit)
+		    (replace-match (concat "width=\"" (number-to-string limit)
+					   "\"")))
+		(goto-char (match-end 0)))))))
+      (cond ((string-match "\\`blog-\\(?:en\\|ja\\)\\'" group)
+	     (goto-char (point-min))
+	     (when (and (or (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"block article\"" nil t)
+			    (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"block header\"" nil t))
+			(shimbun-end-of-tag "div"))
+	       (goto-char (setq start (match-beginning 2)))
+	       (when (re-search-forward "[\t\n ]*\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"footer\"" nil t)
+		 (delete-region (match-beginning 0) (point-max))
+		 (insert "\n")
+		 (delete-region (point-min) start))))
+	    ((string-match "\\`blog-" group)
+	     (goto-char (point-min))
+	     (when (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"entry-body\"" nil t)
+			(shimbun-end-of-tag "div" t))
+	       (delete-region (match-end 2) (point-max))
+	       (insert "\n")
+	       (delete-region (point-min) (match-beginning 2))
+	       (goto-char (point-min))
+	       (while (re-search-forward "\
+\[\t\n 　]*<p>\\(?:[\t\n 　]*\\|[\t\n ]*&nbsp;[\t\n ]*\\)</p>[\t\n 　]*"
+					 nil t)
+		 (replace-match "")))))
+      ;; Zenkaku ASCII -> Hankaku
+      (unless (memq (shimbun-japanese-hankaku shimbun) '(header subject nil))
+	(shimbun-japanese-hankaku-buffer t)))))
+
+(luna-define-method shimbun-make-contents :around ((shimbun shimbun-kantei)
+						   header)
+  (if (string-match "\\`m-magazine-\\(?:cn\\|en\\|ja\\|kr\\)\\'"
+		    (shimbun-current-group-internal shimbun))
+      ;; Choose a face according to the author.
+      (let ((shimbun-x-face-database-function
+	     (or shimbun-x-face-database-function
+		 (let ((from (shimbun-header-from header t)))
+		   `(lambda (ignore)
+		      ,(cdr (nth
+			     (cond ((member from '("Naoto Kan"
+						   "菅直人"))
+				    1)
+				   ((member from '("Yukio Hatoyama"
+						   "鳩山由紀夫"
+						   "�p/山由�射夫"
+						   "�GOEd>_86 �@/E0?@"))
+				    2)
+				   ((member from '("Taro Aso"
+						   "麻生太郎"))
+				    3)
+				   ((member from '("Yasuo Fukuda"
+						   "福田康夫"))
+				    4)
+				   ((member from '("Shinzo Abe"
+						   "安倍晋三"))
+				    5)
+				   ((member from '("Junichiro Koizumi"
+						   "小泉純一郎"))
+				    6)
+				   (t
+				    0))
+			     shimbun-kantei-x-face-alist)))))))
+	(luna-call-next-method))
+    (luna-call-next-method)))
 
 (provide 'sb-kantei)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-kde.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-kde.el
--- work/emacs-w3m-1.4.4/shimbun/sb-kde.el	2003-12-24 11:58:57.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-kde.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-laut-de.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-laut-de.el
--- work/emacs-w3m-1.4.4/shimbun/sb-laut-de.el	2004-10-11 08:14:32.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-laut-de.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-laut-de.el --- shimbun backend for <http://www.laut.de/>
 
-;; Copyright (C) 2004 Andreas Seltenreich <seltenreich@gmx.de>
+;; Copyright (C) 2004, 2005, 2006, 2010
+;; Andreas Seltenreich <seltenreich@gmx.de>
 
 ;; Author: Andreas Seltenreich <seltenreich@gmx.de>
 ;; Keywords: news
@@ -17,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
@@ -29,19 +30,22 @@
 (luna-define-class shimbun-laut-de (shimbun-rss) ())
 
 (defvar shimbun-laut-de-groups
-  '("platten"
-    "news"
-    "platten_rock"
-    "platten_pop"
+  '("news"
+    "platten"
     "platten_alternative"
-    "platten_metal"
-    "platten_rnb"
     "platten_dance"
+    "platten_hiphop"
     "platten_jazz"
-    "platten_hiphop"))
+    "platten_metal"
+    "platten_pop"
+    "platten_rnb"
+    "platten_rock"))
 
 (defvar shimbun-laut-de-content-start
-  "<!-- headline -->\\|<span class=\"ueberschriftnormalgrau[^>]*>")
+  (concat
+   "<!-- headline -->\\|"
+   "<span class=\"ueberschriftnormalgrau[^>]*>\\|"
+   "<span class=\"inhaltsueberschrift\">"))
 
 (defvar shimbun-laut-de-content-end
   (concat "<!-- /box weitere Links -->\\|"
@@ -50,26 +54,23 @@
 
 (defvar shimbun-laut-de-from-address "redaktion@laut.de")
 
-(luna-define-method shimbun-headers :before ((shimbun shimbun-laut-de)
-					     &rest range)
-  shimbun)
-
 (luna-define-method shimbun-groups ((shimbun shimbun-laut-de))
   shimbun-laut-de-groups)
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-laut-de) url date)
-  (unless (string-match "laut.de/\\(.*\\)/" url)
-    (error "Cannot find message-id base"))
-  (format "<%s@sb-laut-de.invalid>" 
-	  (shimbun-replace-in-string
-	   (match-string-no-properties 1 url)
-	   "[^a-zA-Z0-9]" "%")))
-
 (luna-define-method shimbun-index-url ((shimbun shimbun-laut-de))
   (concat "http://www.laut.de/partner/allgemein/"
 	  (shimbun-current-group-internal shimbun) ".rdf"))
 
+(luna-define-method shimbun-clear-contents :after ((shimbun shimbun-laut-de)
+						     header)
+  (shimbun-remove-tags "script" t)
+  (shimbun-remove-tags
+   "<img src=\"/images/\\(?:voting\\|leer\\)[^\"]+gif" ">")
+  (shimbun-remove-tags
+   "<img[^>]+\\(?:width=\"1\"\\|height=\"1\"\\)[^>]*>")
+  (shimbun-remove-tags
+   "\\(a\\) href=\"[^\"]+lautshop_preisvergleich_detail.php" t))
+
 (provide 'sb-laut-de)
 
 ;;; sb-laut-de.el ends here
Only in work/emacs-w3m-1.4.4/shimbun: sb-linux-ja.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-linuxce-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-linuxce-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-linuxce-jp.el	2001-11-20 13:51:23.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-linuxce-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-lotusex.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-lotusex.el
--- work/emacs-w3m-1.4.4/shimbun/sb-lotusex.el	2005-03-14 07:31:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-lotusex.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-lump.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-lump.el
--- work/emacs-w3m-1.4.4/shimbun/sb-lump.el	2005-03-14 07:31:23.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-lump.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-m17n.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-m17n.el
--- work/emacs-w3m-1.4.4/shimbun/sb-m17n.el	2003-11-18 10:57:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-m17n.el	2009-05-11 10:17:59.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-m17n.el --- shimbun backend for m17n.org
 
-;; Copyright (C) 2001, 2002, 2003 Akihiro Arisawa <ari@mbf.sphere.ne.jp>
+;; Copyright (C) 2001, 2002, 2003, 2006, 2009
+;; Akihiro Arisawa <ari@mbf.sphere.ne.jp>
 
 ;; Author: Akihiro Arisawa <ari@mbf.sphere.ne.jp>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
@@ -32,13 +33,20 @@
 
 (luna-define-class shimbun-m17n (shimbun-mhonarc) ())
 
+(defvar shimbun-m17n-url "http://www.m17n.org/mlarchive/")
+
 (defconst shimbun-m17n-group-path-alist
-  '(("mule-ja" "mule-ja-archive/" "mule-ja@m17n.org")
-    ("mule" "mule-archive/" "mule@m17n.org")))
+  '(("mule-ja" "mule-ja/" "mule-ja@m17n.org")
+    ("mule" "mule/" "mule@m17n.org")))
 
-(defvar shimbun-m17n-url "http://www.m17n.org/")
 (defvar shimbun-m17n-groups (mapcar 'car shimbun-m17n-group-path-alist))
 
+(defvar shimbun-m17n-x-face-alist
+  '(("default" . "X-Face: '>=krMO{M-21~VC2Y-{q4s}ckFG89D`j^w\
+:FI[z%_o+'mV,NKiQlN5v9i+<6EuQs\\I!3UB_\n ZY>/Nhd6A?6:B'+zCXV\
+tcW.jD{Y&/'K6$ls7r8!M%HnBCV[j;?Vr!3l|dWt%.%Wx8nvzk1+w5Uw6Zb\n\
+ |?bUC;wOQxjd46p\\MP[x{+0i|lA\\fZ)@4_|!uG;=M\\Y}I&D3dP00O")))
+
 (luna-define-method shimbun-index-url ((shimbun shimbun-m17n))
   (shimbun-expand-url (nth 1 (assoc (shimbun-current-group-internal shimbun)
 				    shimbun-m17n-group-path-alist))
@@ -58,32 +66,34 @@
     (catch 'stop
       (while (and (if pages (<= (incf count) pages) t)
 		  (re-search-forward
-		   "<A HREF=\"\\([0-9][0-9][0-9][0-9]-[0-9]+\\)/index.html\">\\[Date Index\\]"
+		   "<A HREF=\"\\([0-9]+\\)/maillist\\.html\">"
 		   nil t)
 		  (push (match-string 1) months)))
       (setq months (nreverse months))
       (dolist (month months)
-	(let ((url (shimbun-expand-url (concat month "/")
+	(let ((url (shimbun-expand-url (concat month "/maillist.html")
 				       (shimbun-index-url shimbun))))
+	  (erase-buffer)
 	  (shimbun-retrieve-url url t)
 	  (goto-char (point-max))
-	  (while (re-search-backward
-		  "<STRONG><A NAME=\"\\([0-9]+\\)\" HREF=\"\\(msg[0-9]+.html\\)\">\\([^<]+\\)</A></STRONG><BR>\n<EM>From</EM>: \\([^<]+\\)<EM>Date</EM>: \\(.*\\)"
-		  nil t)
+	  (while (re-search-backward "\
+<a name=\"\\([0-9]+\\)\" href=\"\\(msg[0-9]+.html\\)\">\
+\\([^<]+\\)</a></strong>\n\
+<ul><li><em>From</em>: \\([^<]+\\)"
+				     nil t)
 	    (let ((id (format "<%s%s%%%s>" month (match-string 1)
 			      (shimbun-current-group-internal shimbun)))
 		  (xref (shimbun-expand-url (match-string 2) url))
 		  (subject (shimbun-mhonarc-replace-newline-to-space
 			    (match-string 3)))
 		  (from (shimbun-mhonarc-replace-newline-to-space
-			 (match-string 4)))
-		  (date (match-string 5)))
+			 (match-string 4))))
 	      (if (shimbun-search-id shimbun id)
 		  (throw 'stop headers)
 		(push (shimbun-make-header 0
 					   (shimbun-mime-encode-string subject)
 					   (shimbun-mime-encode-string from)
-					   date id "" 0 0 xref)
+					   nil id "" 0 0 xref)
 		      headers)))))))
     headers))
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-macosx-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-macosx-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-macosx-jp.el	2002-08-21 05:56:05.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-macosx-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mailarc.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mailarc.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mailarc.el	2005-03-14 07:31:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mailarc.el	2005-07-06 08:52:29.000000000 +0900
@@ -17,8 +17,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mailman.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mailman.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mailman.el	2005-02-14 07:25:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mailman.el	2012-05-01 15:10:07.000000000 +0900
@@ -1,12 +1,12 @@
 ;;; sb-mailman.el --- shimbun backend class for mailman archiver -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 2002, 2003 NAKAJIMA Mikio <minakaji@namazu.org>
-;; Copyright (C) 2002       Katsumi Yamaoka <yamaoka@jpl.org>
-;; Copyright (C) 2005       Tsuyoshi CHO <cho@namazu.org>
+;; Copyright (C) 2002, 2008 Katsumi Yamaoka <yamaoka@jpl.org>
+;; Copyright (C) 2005       Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
 ;; Authors: NAKAJIMA Mikio  <minakaji@namazu.org>,
 ;;          Katsumi Yamaoka <yamaoka@jpl.org>,
-;;          Tsuyoshi CHO    <cho@namazu.org>
+;;          Tsuyoshi CHO    <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -22,9 +22,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -42,9 +42,9 @@
 
 (defun shimbun-mailman-make-contents (shimbun header)
   (subst-char-in-region (point-min) (point-max) ?\t ?\  t)
-  (shimbun-decode-entities)
   (goto-char (point-min))
-  (let ((end (search-forward "<!--beginarticle-->")))
+  (let ((end (search-forward "<!--beginarticle-->"))
+	name address)
     (goto-char (point-min))
     (search-forward "</HEAD>")
     (when (re-search-forward "<H1>\\([^\n]+\\)\\(\n +\\)?</H1>" end t nil)
@@ -54,14 +54,35 @@
     (when (re-search-forward "<B>\\([^\n]+\\)\\(\n +\\)?</B> *\n +\
 <A HREF=\"[^\n]+\n +TITLE=\"[^\n]+\">\\([^\n]+\\)"
 			     end t nil)
+      (setq name (match-string 1)
+	    address (match-string 3))
+      (when (string-match " at " name)
+	(setq name (concat (substring name 0 (match-beginning 0))
+			   "@"
+			   (substring name (match-end 0)))))
+      (when (string-match " at " address)
+	(setq address (concat (substring address 0 (match-beginning 0))
+			      "@"
+			      (substring address (match-end 0)))))
       (shimbun-header-set-from
        header
-       (shimbun-mime-encode-string (concat (match-string 1)
-					   " <" (match-string 3) ">")))
-      (when (re-search-forward "<I>\\([^\n]+\\)</I>" end t nil)
-	(shimbun-header-set-date header (match-string 1)))
+       (shimbun-mime-encode-string (concat name " <" address ">")))
+      (when (re-search-forward "<I>\
+\\(?:\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) \\)?\
+\\([^\n]+\\)</I>" end t nil)
+	(if (match-beginning 1)
+	    (shimbun-header-set-date
+	     header (concat (match-string 1) ", " (match-string 2)))
+	  (shimbun-header-set-date header (match-string 2))))
       (delete-region (point-min) end)
       (delete-region (search-forward "<!--endarticle-->") (point-max))
+      ;; Remove useless hrefs being added to things looking like mail
+      ;; addresses, and restore them to the original.
+      (let ((case-fold-search t))
+	(goto-char (point-min))
+	(while (re-search-forward
+		"<a +href=[^>]+>\\([^<]+\\) at \\([^<]+\\)</a>" nil t)
+	  (replace-match "\\1@\\2")))
       (shimbun-header-insert-and-buffer-string shimbun header nil t))))
 
 (luna-define-method shimbun-make-contents ((shimbun shimbun-mailman) header)
@@ -81,8 +102,9 @@
       (let ((pages (shimbun-header-index-pages range))
 	    (count 0))
 	(while (and (if pages (<= (incf count) pages) t)
-		    (re-search-forward "<a href=\"\\(20[0-9][0-9]q[1-4]\
-\\|20[0-9][0-9]-\\(January\\|February\\|March\\|April\\|May\\|June\
+		    (re-search-forward "\
+<a href=\"\\(20[0-9][0-9]\\(?:q[1-4]\\)?\
+\\|20[0-9][0-9]-\\(?:January\\|February\\|March\\|April\\|May\\|June\
 \\|July\\|August\\|September\\|October\\|November\\|December\\)\
 \\)/date.html\">"
 				       nil t))
@@ -112,8 +134,8 @@
 		  from (match-string 4))
 	    (setq subject (with-temp-buffer
 			    (insert subject)
-			    (shimbun-decode-entities)
 			    (shimbun-remove-markup)
+			    (shimbun-decode-entities)
 			    (buffer-string)))
 	    (push (shimbun-make-header
 		   0 (shimbun-mime-encode-string subject)
@@ -133,7 +155,6 @@
 
 (defun shimbun-mailman-ja-make-contents (shimbun header)
   (subst-char-in-region (point-min) (point-max) ?\t ?\  t)
-  (shimbun-decode-entities)
   (goto-char (point-min))
   (let ((end (search-forward "<!--beginarticle-->"))
 	name address date)
@@ -179,6 +200,13 @@
 	(shimbun-header-set-date header date))
       (delete-region (point-min) end)
       (delete-region (search-forward "<!--endarticle-->") (point-max))
+      ;; Remove useless hrefs being added to things looking like mail
+      ;; addresses, and restore them to the original.
+      (let ((case-fold-search t))
+	(goto-char (point-min))
+	(while (re-search-forward "\
+<a +href=[^>]+>\\([^<]+\\) \\(?:＠\\|at\\) \\([^<]+\\)</a>" nil t)
+	  (replace-match "\\1@\\2")))
       (shimbun-header-insert-and-buffer-string shimbun header nil t))))
 
 (luna-define-method shimbun-make-contents ((shimbun shimbun-mailman-ja) header)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mainichi.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mainichi.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mainichi.el	2004-12-25 01:07:37.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mainichi.el	2012-04-16 11:19:40.000000000 +0900
@@ -1,6 +1,6 @@
-;;; sb-mainichi.el --- shimbun backend for MSN-Mainichi -*- coding: iso-2022-7bit; -*-
+;;; sb-mainichi.el --- shimbun backend for Mainichi jp -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Koichiro Ohba <koichiro@meadowy.org>
+;; Copyright (C) 2001-2009, 2011, 2012 Koichiro Ohba <koichiro@meadowy.org>
 
 ;; Author: Koichiro Ohba <koichiro@meadowy.org>
 ;;         Katsumi Yamaoka <yamaoka@jpl.org>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -31,39 +31,67 @@
 
 ;;; Code:
 
-(require 'shimbun)
+(require 'sb-rss)
+(require 'sb-multi)
 
-(luna-define-class shimbun-mainichi (shimbun-japanese-newspaper shimbun) ())
+(luna-define-class shimbun-mainichi (shimbun-japanese-newspaper
+				     shimbun-multi shimbun-rss) ())
 
-(defvar shimbun-mainichi-top-level-domain "mainichi-msn.co.jp"
-  "Name of the top level domain for the MSN-Mainichi INTERACTIVE.")
+(defvar shimbun-mainichi-url "http://mainichi.jp/")
 
-(defvar shimbun-mainichi-url
-  (concat "http://www." shimbun-mainichi-top-level-domain "/")
-  "Name of the parent url.")
-
-(defvar shimbun-mainichi-group-table
-  '(("shakai" "社会")
-    ("shakai.edu" "教育")
-    ("sports" "スポーツ")
-    ("geinou" "芸能")
-    ("kurashi" "暮らし")
-    ("it" "IT")
-    ("kagaku.science" "科学")
-    ("kagaku.env" "環境")
-    ("kagaku.medical" "医学")
-    ("seiji" "政治")
-    ("keizai" "経済")
-    ("kokusai" "国際"))
-  "List of supported groups and Japanese translations.")
+(defvar shimbun-mainichi-top-level-domain "mainichi.jp")
 
 (defvar shimbun-mainichi-server-name "毎日新聞")
-(defvar shimbun-mainichi-from-address
-  (concat "webmaster@" shimbun-mainichi-top-level-domain))
-(defvar shimbun-mainichi-content-start
-  "<!--[\t\n ]+START[\t\n ]+Article[\t\n ]+-->[\t\n ]*")
-(defvar shimbun-mainichi-content-end
-  "\\([\t\n ]*<[^>]+>\\)*[\t\n ]*<!--[\t\n ]+END[\t\n ]+Article[\t\n ]+-->")
+
+(defvar shimbun-mainichi-prefer-text-plain nil
+  "*Non-nil means prefer text/plain articles rather than html articles.")
+
+(defvar shimbun-mainichi-ignored-subject "\\`PR: ")
+
+(luna-define-method initialize-instance :after ((shimbun shimbun-mainichi)
+						&rest init-args)
+  (shimbun-rss-initialize-ignored-subject shimbun))
+
+(defvar shimbun-mainichi-group-table
+  '(("flash" "ニュース速報"
+     "http://mainichi.jp/rss/etc/flash.rss")
+    ("sports" "スポーツ"
+     "http://mainichi.jp/rss/etc/sports.rss")
+    ("entertainment" "エンターテインメント"
+     "http://mainichi.jp/rss/etc/enta.rss")
+    ("mantan" "アニメ・マンガ・ゲーム"
+     "http://mainichi.jp/rss/etc/mantan.rss")
+    ("electronics" "ＩＴ・家電"
+     "http://mainichi.jp/rss/etc/electronics.rss")
+    ("weekly" "英語を学ぶ"
+     "http://mainichi.jp/rss/etc/weekly.rss")
+    ;; Non-RSS groups.
+    ("opinion.editorial" "社説"
+     "http://mainichi.jp/select/opinion/editorial/archive/")
+    ("opinion.yoroku" "余録"
+     "http://mainichi.jp/select/opinion/yoroku/archive/")
+    ("opinion.hasshinbako" "発信箱"
+     "http://mainichi.jp/select/opinion/hasshinbako/archive/")
+    ("opinion.eye" "記者の目"
+     "http://mainichi.jp/select/opinion/eye/archive/")
+    ("opinion.hito" "ひと"
+     "http://mainichi.jp/select/opinion/hito/archive/")
+    ("opinion.kinji" "近事片々"
+     "http://mainichi.jp/select/opinion/kinji/archive/")
+    ("opinion.yuraku" "憂楽帳"
+     "http://mainichi.jp/select/opinion/yuraku/archive/")
+    ("opinion.closeup" "クローズアップ"
+     "http://mainichi.jp/select/opinion/closeup/archive/")
+    ("opinion.kaisetsu" "土曜解説"
+     "http://mainichi.jp/select/opinion/kaisetsu/")
+    ("opinion.newsup" "ニュースＵＰ"
+     "http://mainichi.jp/select/opinion/newsup/")
+    ("opinion.jidainokaze" "時代の風"
+     "http://mainichi.jp/select/opinion/jidainokaze/")
+    ("entertainment.art" "芸術・文化"
+     "http://mainichi.jp/enta/art/archive/")
+    ("fuchisou" "風知草"
+     "http://mainichi.jp/select/seiji/fuchisou/")))
 
 (defvar shimbun-mainichi-x-face-alist
   '(("default" . "\
@@ -86,188 +114,239 @@
 		shimbun-mainichi-group-table)))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-mainichi))
-  (concat (shimbun-url-internal shimbun)
-	  (shimbun-subst-char-in-string
-	   ?. ?/ (shimbun-current-group-internal shimbun))
-	  "/"))
-
-(defun shimbun-mainichi-make-date-string (&rest args)
-  "Run `shimbun-make-date-string' with ARGS and fix a day if needed.
-
-\(shimbun-mainichi-make-date-string YEAR MONTH DAY &optional TIME TIMEZONE)"
-  (save-match-data
-    (let* ((ctime (current-time))
-	   (date (apply 'shimbun-make-date-string args))
-	   (time (shimbun-time-parse-string date))
-	   (ms (car time))
-	   (ls (cadr time))
-	   (system-time-locale "C"))
-      (if (or (> ms (car ctime))
-	      (and (= ms (car ctime))
-		   (> ls (cadr ctime))))
-	  ;; It should be yesterday's same time.
-	  (progn
-	    (setq ms (1- ms))
-	    (when (< (setq ls (- ls (eval-when-compile (- (* 60 60 24) 65536))))
-		     0)
-	      (setq ms (1- ms)
-		    ls (+ ls 65536)))
-	    (format-time-string "%a, %d %b %Y %R +0900" (list ms ls)))
-	date))))
-
-(defun shimbun-mainichi-get-headers (shimbun)
-  (let* ((group (shimbun-current-group-internal shimbun))
-	 (hierarchy (when (string-match "\\." group)
-		      (mapconcat 'identity
-				 (nreverse (split-string group "\\."))
-				 ".")))
-	 (from (shimbun-from-address shimbun))
-	 (case-fold-search t)
-	 url urls subgroup header topnews headers date)
-    (while (search-forward "\r" nil t)
-      (delete-backward-char 1))
-    (goto-char (point-min))
-    (while (re-search-forward "\
-<!--[\t\n ]*MEROS[\t\n ]+START[\t\n ]+Module=[^>]+>"
-			      nil t)
-      (narrow-to-region (point)
-			(or (re-search-forward "\
-<!--[\t\n ]*MEROS[\t\n ]+END[\t\n ]+Module[^>]+>"
+  (nth 2 (assoc (shimbun-current-group-internal shimbun)
+		shimbun-mainichi-group-table)))
+
+(luna-define-method shimbun-headers :around ((shimbun shimbun-mainichi)
+					     &optional range)
+  (if (string-match "\\.rss\\'" (shimbun-index-url shimbun))
+      ;; Use the function defined in sb-rss.el.
+      (luna-call-next-method)
+    ;; Use the default function defined in shimbun.el.
+    (funcall (intern "shimbun-headers"
+		     (luna-class-obarray (luna-find-class 'shimbun)))
+	     shimbun range)))
+
+(luna-define-method shimbun-get-headers :around ((shimbun shimbun-mainichi)
+						 &optional range)
+  (let ((from (concat shimbun-mainichi-server-name " ("
+		      (shimbun-current-group-name shimbun) ")"))
+	headers)
+    (if (string-match "\\.rss\\'" (shimbun-index-url shimbun))
+	(progn
+	  (shimbun-strip-cr)
+	  (goto-char (point-min))
+	  (while (and (search-forward "<title><![CDATA[AD:" nil t)
+		      (re-search-backward "<item[\t\n ]*" nil t)
+		      (shimbun-end-of-tag "item" t))
+	    (replace-match "\n"))
+	  (dolist (header (setq headers (luna-call-next-method)) headers)
+	    (shimbun-header-set-from header from)))
+      (shimbun-mainichi-get-headers shimbun range from))))
+
+(luna-define-method shimbun-rss-build-message-id :around ((shimbun
+							   shimbun-mainichi)
+							  url &optional date)
+  ;; Don't strip string following "?" or "#" in url.  See sb-rss.el.
+  (concat "<" (md5 url) "%" (shimbun-current-group shimbun)
+	  "@" (shimbun-server shimbun) ".shimbun.namazu.org>"))
+
+(defun shimbun-mainichi-get-headers (shimbun range from)
+  "Get headers for non-RSS groups."
+  (let ((rgrp (mapconcat 'identity
+			 (nreverse (split-string
+				    (shimbun-current-group-internal shimbun)
+				    "\\."))
+			 "."))
+	(count 0)
+	(index (shimbun-index-url shimbun))
+	(pages (shimbun-header-index-pages range))
+	end id headers indices idx)
+    (catch 'stop
+      (while t
+	(shimbun-strip-cr)
+	(goto-char (point-min))
+	(when (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"NewsArticle\""
+				      nil t)
+		   (shimbun-end-of-tag "div"))
+	  (goto-char (match-beginning 0))
+	  (setq end (match-end 0))
+	  (while (re-search-forward
+		  (eval-when-compile
+		    (concat
+		     "<a[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*href=\""
+		     ;; 1. url
+		     "\\([^\"]+/"
+		     ;; 2. serial number
+		     "\\("
+		     ;; 3. year
+		     "\\(20[0-9][0-9]\\)"
+		     ;; 4. month
+		     "\\([01][0-9]\\)"
+		     ;; 5. day
+		     "\\([0-3][0-9]\\)"
+		     "[^.]+\\)\\.html\\)\""
+		     "\\(?:[\t\n ]+[^\t\n >]+\\)*[\t\n ]*>[\t\n ]*"
+		     ;; 6. subject
+		     "\\([^<]+\\)"))
+		  end t)
+	    (setq id (concat "<" (match-string 2) "." rgrp
+			     "%" shimbun-mainichi-top-level-domain ">"))
+	    (if (shimbun-search-id shimbun id)
+		(unless (zerop count)
+		  (throw 'stop nil))
+	      (push (shimbun-create-header
+		     0 (match-string 6) from
+		     (shimbun-make-date-string
+		      (string-to-number (match-string 3))
+		      (string-to-number (match-string 4))
+		      (string-to-number (match-string 5)))
+		     id "" 0 0
+		     (shimbun-expand-url (match-string 1) index))
+		    headers))))
+	(push index indices)
+	(if (and (or (not pages)
+		     (< (setq count (1+ count)) pages))
+		 (progn
+		   (goto-char (point-min))
+		   (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"CalendarBar\""
+				      nil t))
+		 (shimbun-end-of-tag "div")
+		 (progn
+		   (setq end (match-beginning 0)
+			 idx nil)
+		   (while (and (not idx)
+			       (re-search-backward "\
+<a[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*href=\"\\([^\"]+\\)\""
+						   end t))
+		     (when (member (setq idx (shimbun-expand-url
+					      (match-string 1) index))
+				   indices)
+		       (setq idx nil)))
+		   idx))
+	    (progn
+	      (setq index idx)
+	      (erase-buffer)
+	      (shimbun-fetch-url shimbun index t)
+	      (goto-char (point-min)))
+	  (throw 'stop nil))))
+    headers))
+
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-mainichi)
+					    header url)
+  (shimbun-mainichi-multi-next-url shimbun header url))
+
+(defun shimbun-mainichi-multi-next-url (shimbun header url)
+  (goto-char (point-min))
+  (let (end)
+    (when (and (or (and (re-search-forward "\
+<nav[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*id=\"SearchPageAutoWrap\"" nil t)
+			(shimbun-end-of-tag "nav"))
+		   (progn
+		     (goto-char (point-min))
+		     (and (re-search-forward "\
+<ul[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"SearchPageWrap clr\"" nil t)
+			  (shimbun-end-of-tag "ul"))))
+	       (progn
+		 (goto-char (match-beginning 0))
+		 (setq end (match-end 0))
+		 (re-search-forward "\
+<li[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"PageSelect\"" end t))
+	       (re-search-forward "\
+<a[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*href=\"\\([^\"]+\\)" end t))
+      (shimbun-expand-url (match-string 1) url))))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-mainichi)
+						    header)
+  (shimbun-mainichi-clear-contents shimbun header))
+
+(defun shimbun-mainichi-clear-contents (shimbun header)
+  (shimbun-strip-cr)
+  (goto-char (point-min))
+  (let ((group (shimbun-current-group-internal shimbun))
+	(hankaku (shimbun-japanese-hankaku shimbun))
+	(case-fold-search t)
+	arts)
+    (when (string-equal group "weekly")
+      (when (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"Words\""
+				    nil t)
+		 (shimbun-end-of-tag "div"))
+	(setq arts (list (match-string 2))))
+      (when (and (re-search-forward "\
+<\\([^\t\n >]+\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"NewsTitle\""
+				    nil t)
+		 (shimbun-end-of-tag (match-string 1)))
+	(setq arts (nconc arts (list (concat "<p>" (match-string 2) "</p>"))))))
+    (while (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\
+\"\\(?:NewsBody\\(?: clr\\)?\\|Credit\\)\""
+				   nil t)
+		(shimbun-end-of-tag "div"))
+      (push (match-string 2) arts))
+    (erase-buffer)
+    (if arts
+	(progn
+	  (dolist (art (nreverse arts))
+	    (insert art "\n"))
+
+	  ;; Break continuous lines in yoroku articles.
+	  (when (or (string-equal group "opinion.yoroku")
+		    (string-match "\\`余録[:：]"
+				  (shimbun-header-subject header t)))
+	    (goto-char (point-min))
+	    (while (re-search-forward
+		    (eval-when-compile
+		      (concat "[▲"
+			      (condition-case nil
+				  (list (make-char 'mule-unicode-2500-33ff
+						   33 114))
+				(error nil))
+			      "]"))
+		    nil t)
+	      (replace-match "。</p>\n<p>　")))
+
+	  ;; Convert Japanese zenkaku ASCII chars into hankaku.
+	  (when (and hankaku (not (memq hankaku '(header subject))))
+	    (shimbun-japanese-hankaku-buffer t))
+
+	  (if (shimbun-prefer-text-plain-internal shimbun)
+	      (progn
+		;; Replace image tags with text.
+		(goto-char (point-min))
+		(while (and (re-search-forward "\\(<img[\t\n ]+\
+\\(?:[^\t\n >]+[\t\n ]+\\)*alt=\"\\)[^\"]+"
 					       nil t)
-			    (point-max)))
-      (goto-char (point-min))
-      (while (re-search-forward
-	      (eval-when-compile
-		(let ((s0 "[\t\n ]*")
-		      (s1 "[\t\n ]+"))
-		  (concat "<a" s1 "href=\"/"
-			  ;; 1. url
-			  "\\([^/]+/"
-			  "\\("
-			  ;; 3. subgroup
-			  "\\([^/]+\\)"
-			  "/\\)?news/"
-			  ;; 4. serial number
-			  "\\("
-			  ;; 5. year
-			  "\\(20[0-9][0-9]\\)"
-			  ;; 6. month
-			  "\\([01][0-9]\\)"
-			  ;; 7. day
-			  "\\([0-3][0-9]\\)"
-			  "[0-9a-z]+\\)"
-			  "\\.html\\)"
-			  "[^>]*>\\(" s0 "<[^>]+>\\)*" s0
-			  ;; 9+11. subject
-			  "\\([^<]+\\)\\(<br[^>]+>\\)?\\([^<]+\\)"
-			  "\\(\\(" s0 "<[^>]+>\\)+" s0
-			  ;; 14. hour
-			  "\\([012]?[0-9]\\)"
-			  ":"
-			  ;; 15. minute
-			  "\\([0-5]?[0-9]\\)"
-			  "\\)?")))
-	      nil t)
-	(unless ;; Exclude duplications.
-	    (member (setq url
-			  (file-name-nondirectory (match-string 1)))
-		    urls)
-	  (push url urls)
-	  (setq subgroup (when (match-beginning 3)
-			   (match-string 3)))
-	  (setq header
-		(shimbun-create-header
-		 0
-		 (concat (match-string 9) (match-string 11))
-		 from
-		 (shimbun-mainichi-make-date-string
-		  (string-to-number (match-string 5))
-		  (string-to-number (match-string 6))
-		  (string-to-number (match-string 7))
-		  (if (match-beginning 15)
-		      (format "%02d:%02d"
-			      (string-to-number (match-string 14))
-			      (string-to-number (match-string 15)))
-		    (unless subgroup
-		      ;; It may be a top news.
-		      "23:59:59")))
-		 (concat "<" (match-string 4) "%"
-			 (or hierarchy
-			     (concat (or subgroup "top") "." group))
-			 "." shimbun-mainichi-top-level-domain ">")
-		 "" 0 0
-		 (concat shimbun-mainichi-url (match-string 1))))
-	  (unless subgroup
-	    (push header topnews))
-	  (push header headers)))
-      (goto-char (point-max))
-      (widen))
-    (prog1
-	(shimbun-sort-headers headers)
-      ;; Fix date headers for top news.
-      (while topnews
-	(setq header (pop topnews)
-	      date (shimbun-header-date header))
-	(when (string-match "23:59:59" date)
-	  (shimbun-header-set-date header
-				   (replace-match "00:00" nil nil date)))))))
-
-(luna-define-method shimbun-get-headers ((shimbun shimbun-mainichi)
-					 &optional range)
-  (shimbun-mainichi-get-headers shimbun))
-
-(defun shimbun-mainichi-prepare-article (shimbun header)
-  (let ((case-fold-search t))
-    (while (search-forward "\r" nil t)
-      (delete-backward-char 1))
-    (goto-char (point-min))
-    ;; Remove the subject lines.
-    (when (re-search-forward "<\\([0-9a-z]+\\)[\t\n ]+class=\"m-title" nil t)
-      (let ((start (match-beginning 0)))
-	(when (search-forward (concat "</" (match-string 1) ">") nil t)
-	  (delete-region start (point)))))
-    ;; Fix the Date header.
-    (when (re-search-forward
-	   (eval-when-compile
-	     (let ((s0 "[\t\n 　]*")
-		   (s1 "[\t\n 　]+"))
-	       (concat "<span" s1 "class=\"m-txt[^>]+>" s0 "毎日新聞" s1
-		       ;; 1. year
-		       "\\(20[0-9][0-9]\\)"
-		       s0 "年" s0
-		       ;; 2. month
-		       "\\([01]?[0-9]\\)"
-		       s0 "月" s0
-		       ;; 3. day
-		       "\\([0-3]?[0-9]\\)"
-		       s0 "日" s0
-		       ;; 4. hour
-		       "\\([012]?[0-9]\\)"
-		       s0 "時" s0
-		       ;; 5. minute
-		       "\\([0-5]?[0-9]\\)"
-		       s0 "分" s0 "</span>")))
-	   nil t)
-      (shimbun-header-set-date
-       header
-       (shimbun-make-date-string
-	(string-to-number (match-string 1))
-	(string-to-number (match-string 2))
-	(string-to-number (match-string 3))
-	(format "%02d:%02d"
-		(string-to-number (match-string 4))
-		(string-to-number (match-string 5))))))
-    ;; Break continuous lines.
-    (when (string-match "\\`余録：" (shimbun-header-subject header 'no-encode))
+			    (shimbun-end-of-tag nil t))
+		  (replace-match "\n&lt;写真&gt;\n")))
+	    ;; Break long lines.
+	    (shimbun-break-long-japanese-lines))
+	  t)
+
+      (insert "<html><body>\
+この記事はもうありません。<br>\n\
+\(さもなければ通常とは異なる形式を使っているか、<br>\n\
+&nbsp;または取得に失敗したのかもしれません。)</body></html>\n")
+      nil)))
+
+(luna-define-method shimbun-multi-clear-contents :around ((shimbun
+							   shimbun-mainichi)
+							  header
+							  has-previous-page
+							  has-next-page)
+  (shimbun-mainichi-multi-clear-contents shimbun header
+					 has-previous-page has-next-page))
+
+(defun shimbun-mainichi-multi-clear-contents (shimbun header
+						      has-previous-page
+						      has-next-page)
+  (when (luna-call-next-method)
+    (when has-previous-page
       (goto-char (point-min))
-      (while (search-forward "▲" nil t)
-	(replace-match "。<br>\\&<br>")))
-    ;; Break long lines.
-    (shimbun-break-long-japanese-lines shimbun)))
-
-(luna-define-method shimbun-make-contents :before ((shimbun shimbun-mainichi)
-						   header)
-  (shimbun-mainichi-prepare-article shimbun header))
+      (insert "&#012;\n"))
+    t))
 
 (provide 'sb-mainichi)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-makanai.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-makanai.el
--- work/emacs-w3m-1.4.4/shimbun/sb-makanai.el	2005-03-14 07:14:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-makanai.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-makanai.el --- shimbun backend for www.makanai.com -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
 ;; MIYOSHI Masanori <miyoshi@meadowy.org>
 
 ;; Author: MIYOSHI Masanori <miyoshi@meadowy.org>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -31,135 +31,56 @@
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
+(require 'sb-text) ;; For `shimbun-shallow-rendering'.
 
-(eval-and-compile
-  (luna-define-class shimbun-makanai (shimbun shimbun-text) (content-hash))
-  (luna-define-internal-accessors 'shimbun-makanai))
+(luna-define-class shimbun-makanai (shimbun) ())
 
 (defvar shimbun-makanai-url "http://www.makanai.com/")
 (defvar shimbun-makanai-server-name "makanai")
 (defvar shimbun-makanai-groups '("f1news"))
 (defvar shimbun-makanai-group-alist
-  '(("f1news" . "http://www1.wisnet.ne.jp/~matunaga/")))
+  '(("f1news" . "http://www1.wisnet.ne.jp/~matunaga/news/")))
 (defvar shimbun-makanai-from-address  "matunaga@mail1.wisnet.ne.jp")
-(defvar shimbun-makanai-content-hash-length 31)
+(defvar shimbun-makanai-content-start "</font></h3><blockquote>")
+(defvar shimbun-makanai-content-end "</blockquote><br><br>")
 
-(luna-define-method initialize-instance :after ((shimbun shimbun-makanai)
-						&rest init-args)
-  (shimbun-makanai-set-content-hash-internal
-   shimbun
-   (make-vector shimbun-makanai-content-hash-length 0))
-  shimbun)
+(defsubst shimbun-makanai-base-url (shimbun)
+  (cdr (assoc (shimbun-current-group-internal shimbun)
+	      shimbun-makanai-group-alist)))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-makanai))
-  (concat (cdr (assoc (shimbun-current-group-internal shimbun)
-		      shimbun-makanai-group-alist))
-	  "news/001.html"))
-
-(eval-and-compile
-  (unless (and (fboundp 'md5)
-	       (subrp (symbol-function 'md5)))
-    ;; The lisp function might be provided by FLIM.
-    (autoload 'md5 "md5")))
-
-(defun shimbun-makanai-scan-articles (shimbun &optional force-rescan
-					      skip-this-page skip-next-page)
-  (let (headers
-	(case-fold-search t)
-	(search-next-page t))
-    (catch 'stop
-      (while (re-search-forward "<title>F1gpnews</title>" nil t)
-	(while (and (not skip-this-page)
-		    (re-search-forward "<font color=#[0-9a-f]+>\\([0-9]+\\)年\\([0-9]+\\)月\\([0-9]+\\)日(\\(\\w+\\)) \\([^>]+\\) ?</font>" nil t))
-	  (let* ((year (match-string 1))
-		 (month (match-string 2))
-		 (day (match-string 3))
-		 ;;(day-of-week (match-string 4))
-		 (subject (match-string 5))
-		 (article-number (md5 subject))
-		 (article (buffer-substring
-			   (match-end 0)
-			   (progn
-			     (search-forward "</blockquote>" nil t)
-			     (point))))
-		 (id (format "<%s.%s.%s.%s.%s@www.makanai.com>"
-			     year month day
-			     article-number
-			     (shimbun-current-group-internal shimbun)))
-		 (date (shimbun-make-date-string (string-to-number year)
-						 (string-to-number month)
-						 (string-to-number day)))
-		 (xref (format "%s#%s"
-			       (shimbun-index-url shimbun) article-number)))
-	    (if (and (not force-rescan)
-		     (shimbun-search-id shimbun id))
-		(setq search-next-page nil))
-	    (set (intern xref
-			 (shimbun-makanai-content-hash-internal shimbun))
-		 article)
-
-	    (push (shimbun-create-header
-		   0
-		   subject
-		   (shimbun-from-address shimbun)
-		   date id "" 0 0 xref)
-		  headers)))
-	(when (and search-next-page  (not skip-next-page)
-		   (re-search-forward
-		    "<a href=\"\\([^\"]+\\)\">これ以前のニュース</a>" nil t))
-	  (let ((url (concat (shimbun-index-url shimbun)
-			     (match-string 1))))
-	    (erase-buffer)
-	    (shimbun-retrieve-url url t)
-	    (setq skip-this-page nil)
-	    (goto-char (point-min))))))
-    headers))
+  (concat (shimbun-makanai-base-url shimbun)
+	  "000.html"))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-makanai)
 					 &optional range)
-  (shimbun-makanai-scan-articles shimbun))
-
-(defun shimbun-makanai-retrieve-article (shimbun header)
-  (with-temp-buffer
-    (shimbun-retrieve-url (shimbun-index-url shimbun) t)
-    (goto-char (point-min))
-    (shimbun-makanai-scan-articles shimbun t nil t)
-    ;; if not found, try next page
-    (let ((sym (shimbun-makanai-search-article-in-hash shimbun header)))
-      (unless (and sym (boundp sym))
-	(goto-char (point-min))
-	(shimbun-makanai-scan-articles shimbun t t)))))
-
-(defun shimbun-makanai-search-article-in-hash (shimbun header)
-  (intern-soft (shimbun-header-xref header)
-	       (shimbun-makanai-content-hash-internal shimbun)))
-
-(luna-define-method shimbun-article ((shimbun shimbun-makanai) header
-				     &optional outbuf)
-  (when (shimbun-current-group-internal shimbun)
-    (with-current-buffer (or outbuf (current-buffer))
-      (insert
-       (with-temp-buffer
-	 (let ((sym (shimbun-makanai-search-article-in-hash shimbun header)))
-	   (unless (and sym (boundp sym))
-	     (shimbun-makanai-retrieve-article shimbun header)
-	     (setq sym
-		   (shimbun-makanai-search-article-in-hash shimbun header)))
-	   (if (and sym (boundp sym))
-	       (insert (symbol-value sym)))
-	   (shimbun-shallow-rendering)
-	   (goto-char (point-min))
-	   (shimbun-header-insert shimbun header)
-	   (insert "Content-Type: " "text/html"
-		   "; charset=ISO-2022-JP\n"
-		   "MIME-Version: 1.0\n\n")
-	   (encode-coding-string
-	    (buffer-string)
-	    (mime-charset-to-coding-system "ISO-2022-JP"))))))))
-
-(luna-define-method shimbun-close :after ((shimbun shimbun-makanai))
-  (shimbun-makanai-set-content-hash-internal shimbun nil))
+  (let ((case-fold-search t) headers)
+    (when (re-search-forward "<title>F1gpnews</title>" nil t)
+      (while (re-search-forward "<a href=\"\\(\\([0-9]+\\)\.html\\)\">\\([^<]+\\)</a><br>" nil t)
+	(let ((url (match-string 1))
+	      (id (match-string 2))
+	      (subject (match-string 3)))
+	  (save-excursion
+	    (when (re-search-backward "<div>\\([0-9]+\\)年\\([0-9]+\\)月\\([0-9]+\\)日(.*)</div><blockquote>" nil t)
+	      (let ((year (match-string 1))
+		    (month (match-string 2))
+		    (day (match-string 3))
+		    date)
+		(setq date (shimbun-make-date-string
+			    (string-to-number year)
+			    (string-to-number month)
+			    (string-to-number day)))
+		(setq id (format "<%s.%s.%s.%s.%s@www.makanai.com>"
+				 year month day id
+				 (shimbun-current-group-internal shimbun)))
+		(push (shimbun-create-header
+		       0
+		       subject
+		       (shimbun-from-address shimbun)
+		       date id "" 0 0
+		       (concat (shimbun-makanai-base-url shimbun) url))
+		      headers)))))))
+    headers))
 
 (provide 'sb-makanai)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-marc-aims.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-marc-aims.el
--- work/emacs-w3m-1.4.4/shimbun/sb-marc-aims.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-marc-aims.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,17 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
 
 (luna-define-class shimbun-marc-aims (shimbun) ())
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-meadow.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-meadow.el
--- work/emacs-w3m-1.4.4/shimbun/sb-meadow.el	2005-03-14 07:31:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-meadow.el	2007-10-17 20:15:58.000000000 +0900
@@ -22,9 +22,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mew.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mew.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mew.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mew.el	2007-10-17 20:15:58.000000000 +0900
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mhonarc.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mhonarc.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mhonarc.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mhonarc.el	2009-05-21 08:13:31.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-mhonarc.el --- shimbun backend class for mhonarc
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
 ;; Yuuichi Teranishi <teranisi@gohome.org>
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
 ;; Akihiro Arisawa <ari@mbf.sphere.ne.jp>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
@@ -23,9 +23,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -34,9 +34,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 
 (eval-and-compile
@@ -70,20 +67,20 @@
     string))
 
 (defmacro shimbun-mhonarc-extract-header-values (shimbun url headers aux)
-  (` (let ((id (format "<%s%s%%%s>"
-		       (or (, aux) "")
-		       (match-string 1)
-		       (shimbun-current-group-internal (, shimbun))))
-	   (url (shimbun-expand-url (match-string 2) (, url)))
-	   (subject (shimbun-mhonarc-replace-newline-to-space (match-string 3)))
-	   (from (shimbun-mhonarc-replace-newline-to-space (match-string 4))))
-       (if (shimbun-search-id (, shimbun) id)
-	   (throw 'stop (, headers))
-	 (push (shimbun-make-header 0
-				    (shimbun-mime-encode-string subject)
-				    (shimbun-mime-encode-string from)
-				    "" id "" 0 0 url)
-	       (, headers))))))
+  `(let ((id (format "<%s%s%%%s>"
+		     (or ,aux "")
+		     (match-string 1)
+		     (shimbun-current-group-internal ,shimbun)))
+	 (url (shimbun-expand-url (match-string 2) ,url))
+	 (subject (shimbun-mhonarc-replace-newline-to-space (match-string 3)))
+	 (from (shimbun-mhonarc-replace-newline-to-space (match-string 4))))
+     (if (shimbun-search-id ,shimbun id)
+	 (throw 'stop ,headers)
+       (push (shimbun-make-header 0
+				  (shimbun-mime-encode-string subject)
+				  (shimbun-mime-encode-string from)
+				  "" id "" 0 0 url)
+	     ,headers))))
 
 (defmacro shimbun-mhonarc-get-headers (shimbun url headers &optional aux)
   `(save-excursion
@@ -137,7 +134,7 @@
       (delete-char 1))
     (buffer-string)))
 
-(defsubst shimbun-mhonarc-header-value ()
+(defun shimbun-mhonarc-header-value ()
   (let ((pt (point)))
     (prog1
 	(buffer-substring (match-end 0) (std11-field-end))
@@ -230,9 +227,10 @@
 	    (save-restriction
 	      (narrow-to-region start end)
 	      (goto-char (point-min))
-	      (while (re-search-forward (shimbun-regexp-opt
-					 '("<strong>" "</strong>" "<em>" "</em>" "</li>"))
-					nil t)
+	      (while (re-search-forward
+		      (regexp-opt
+		       '("<strong>" "</strong>" "<em>" "</em>" "</li>"))
+		      nil t)
 		(delete-region (match-beginning 0) (match-end 0))
 		(goto-char (match-beginning 0)))
 	      (shimbun-decode-entities)
@@ -244,7 +242,7 @@
 		    (push (cons (match-string 1)
 				(shimbun-mime-encode-string
 				 (buffer-substring (match-end 0)
-						   (line-end-position))))
+						   (point-at-eol))))
 			  alist)))
 		(forward-line 1))
 	      (delete-region (point-min) (point-max)))
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-mozilla-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mozilla-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-mozilla-jp.el	2003-06-18 14:43:58.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-mozilla-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 ;; You have to put the four lines below to ~/.w3m/passwd;
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-msdn.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-msdn.el
--- work/emacs-w3m-1.4.4/shimbun/sb-msdn.el	2005-02-23 21:00:16.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-msdn.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-msdn.el --- shimbun backend for MSDN
 
-;; Copyright (C) 2004, 2005 Yoichi NAKAYAMA <yoichi@geiin.org>
+;; Copyright (C) 2004, 2005, 2006 Yoichi NAKAYAMA <yoichi@geiin.org>
 
 ;; Author: Yoichi NAKAYAMA <yoichi@geiin.org>
 ;; Keywords: news
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -76,16 +76,6 @@
 (luna-define-method shimbun-rss-process-date ((shimbun shimbun-msdn) date)
   date)
 
-(eval-and-compile
-  (autoload 'md5 "md5"))
-
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-msdn) url date)
-  ;; don't insert group name in domain-part for cross posted articles
-  (format "<%s@%s.shimbun.namazu.org>"
-	  (md5 url)
-	  (shimbun-server shimbun)))
-
 (luna-define-method shimbun-article-url ((shimbun shimbun-msdn) header)
   (let ((url (shimbun-article-base-url shimbun header)))
     (if (string-match "\\`http://msdn\\.microsoft\\.com/\
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-msports-nifty.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-msports-nifty.el
--- work/emacs-w3m-1.4.4/shimbun/sb-msports-nifty.el	2005-03-14 06:49:16.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-msports-nifty.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-msports-nifty.el --- shimbun backend for motorsports.nifty.com
 
-;; Copyright (C) 2004, 2005 MIYOSHI Masanori <miyoshi@meadowy.org>
+;; Copyright (C) 2004, 2005, 2006 MIYOSHI Masanori <miyoshi@meadowy.org>
 
 ;; Author: MIYOSHI Masanori <miyoshi@meadowy.org>
 ;; Keywords: news
@@ -18,21 +18,24 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 back end generates text/plain articles unless failing to
+;; extract contents.
+
 ;; Original code was nnshimbun.el written by
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>.
 
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
+(require 'sb-text) ;; For `shimbun-shallow-rendering'.
 
-(luna-define-class shimbun-msports-nifty (shimbun shimbun-text) ())
+(luna-define-class shimbun-msports-nifty (shimbun) ())
 
 (defvar shimbun-msports-nifty-url "http://forum.nifty.com/fmotor/")
 (defvar shimbun-msports-nifty-server-name "@nifty:モータースポーツ")
@@ -43,10 +46,8 @@
     ("Europe" . "europe")
     ("USA" . "usa")))
 (defvar shimbun-msports-nifty-from-address "motorsports_post@nifty.com")
-(defvar shimbun-msports-nifty-content-start
-  "^<div class=\"entry-body-text\">\n<p><FONT[^>]+>.*\n?.*</FONT>.*\n<img[^>]+>")
-(defvar shimbun-msports-nifty-content-end
-  "^</div>\n</div>\n+<div class=\"entry-body-bottom\">")
+(defvar shimbun-msports-nifty-content-start "<div class=\"entry-body-text\">")
+(defvar shimbun-msports-nifty-content-end "<!-- New Menu End -->")
 
 (luna-define-method shimbun-groups ((shimbun shimbun-msports-nifty))
   (mapcar 'car shimbun-msports-nifty-group-alist))
@@ -62,16 +63,14 @@
   (let ((case-fold-search t) headers)
     (goto-char (point-min))
     (while (re-search-forward
-	    "<A HREF='\\(http://.*/\\([0-9]+\\)/\\([0-9][0-9]\\)/index\.html#\\(.*\\)\\)'[^>]*>☆　\\([^<]+\\)<BR>" nil t)
+	    "<A HREF=\"\\(http://.*/\\([0-9]+\\)/[0-9][0-9]\\([0-9][0-9]\\)\\([0-9][0-9]\\)_\\(.*\\)\.htm\\)\"[^>]*>☆　\\([^<]+\\)<" nil t)
       (let ((url (match-string 1))
 	    (year (match-string 2))
 	    (month (match-string 3))
-	    (id (match-string 4))
-	    (subject (match-string 5))
-	    (day 1) date)
-	(save-excursion
-	  (when (re-search-backward "[0-9]+/[0-9][0-9]/\\([0-9][0-9]\\)" nil t)
-	    (setq day (match-string 1))))
+	    (day (match-string 4))
+	    (id (match-string 5))
+	    (subject (match-string 6))
+	    date)
 	(setq id (format "<%s%s%s%s%%%s%%msports@nifty.com>"
 			 year month day
 			 id (shimbun-current-group-internal shimbun)))
@@ -89,15 +88,14 @@
 
 (luna-define-method shimbun-make-contents ((shimbun shimbun-msports-nifty)
 					   header)
-  (let ((id (shimbun-header-id header))
-	start)
+  (let ((id (shimbun-header-id header)))
     (setq id (substring id 9 20))	; extract anchor
     (re-search-forward (format "<a id=\"%s\"></a>" id) nil t)
     (delete-region (point-min) (point))
     (shimbun-header-insert-and-buffer-string
      shimbun header "UTF-8"
      (if (shimbun-clear-contents shimbun header)
-	 (shimbun-shallow-rendering)
+	 (progn (shimbun-shallow-rendering) nil)
        t))))
 
 (provide 'sb-msports-nifty)
Only in work/emacs-w3m-1.4.4/shimbun: sb-muchy.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-multi.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-n24-de.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-n24-de.el
--- work/emacs-w3m-1.4.4/shimbun/sb-n24-de.el	2004-06-07 07:36:18.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-n24-de.el	2007-10-17 20:15:58.000000000 +0900
@@ -17,9 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-namazu.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-namazu.el
--- work/emacs-w3m-1.4.4/shimbun/sb-namazu.el	2004-06-26 00:27:55.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-namazu.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-netbsd.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-netbsd.el
--- work/emacs-w3m-1.4.4/shimbun/sb-netbsd.el	2003-11-18 10:57:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-netbsd.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-nikkansports.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-nikkansports.el
--- work/emacs-w3m-1.4.4/shimbun/sb-nikkansports.el	2005-03-14 07:14:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-nikkansports.el	2008-04-02 17:51:33.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-nikkansports.el --- shimbun backend for www.nikkansports.com -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008
 ;; MIYOSHI Masanori <miyoshi@meadowy.org>
 
 ;; Author: MIYOSHI Masanori <miyoshi@meadowy.org>
@@ -20,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -37,30 +37,55 @@
 		   (shimbun-japanese-newspaper shimbun) ())
 
 (defvar shimbun-nikkansports-url "http://www.nikkansports.com/")
+
 (defvar shimbun-nikkansports-server-name "日刊スポーツ")
+
 (defvar shimbun-nikkansports-group-table
-  '(("baseball" "野球" "ns/baseball/top-bb.html")
-    ("mlb" "大リーグ" "ns/baseball/mlb/top-tp2-bb.html")
-    ("soccer" "サッカー" "ns/soccer/top-sc.html")
-    ("sports" "スポーツ" "ns/sports/top-sp.html")
-    ("battle" "バトル" "ns/battle/top-bt.html")
-    ("horseracing" "競馬" "ns/horseracing/top-hr.html")
-    ("entertainment" "芸能" "ns/entertainment/top-et.html")
-    ("society" "社会" "ns/general/top-so.html")
-    ("leisure" "釣り" "ns/leisure/top-ls.html")))
+  '(("flash" "最新ニュース" "flash/flash-news.html")
+    ("baseball" "野球" "baseball/news/backnumber-baseball.html")
+    ("baseball.highschool" "高校野球"
+     "baseball/highschool/news/backnumber-highschool.html")
+    ("baseball.amateur" "大学・社会人野球"
+     "baseball/amateur/news/backnumber-amateur.html")
+    ("baseball.mlb" "ＭＬＢ" "baseball/mlb/news/backnumber-mlb.html")
+    ("soccer" "サッカー" "soccer/news/backnumber-soccer.html")
+    ("soccer.japan" "サッカー日本代表"
+     "soccer/japan/news/backnumber-japan.html")
+    ("soccer.world" "海外サッカー" "soccer/world/news/backnumber-world.html")
+    ("sports" "スポーツ" "sports/news/backnumber-sports.html")
+    ("sumo" "大相撲" "sports/sumo/news/backnumber-sumo.html")
+    ("nba" "ＮＢＡ" "sports/nba/news/backnumber-nba.html")
+    ("nfl" "ＮＦＬ" "sports/nfl/news/backnumber-nfl.html")
+    ("nhl" "ＮＨＬ" "sports/nhl/news/backnumber-nhl.html")
+    ("rugby" "ラグビー" "sports/rugby/news/backnumber-rugby.html")
+    ("golf" "ゴルフ" "sports/golf/news/backnumber-golf.html")
+    ("motor" "モータースポーツ" "sports/motor/news/backnumber-motor.html")
+    ("battle" "格闘技" "battle/news/backnumber-battle.html")
+    ("race" "競馬" "race/news/backnumber-race.html")
+    ("race.kka" "競輪・競艇・オート" "race/kka/news/backnumber-kka.html")
+    ("entertainment" "芸能" "entertainment/news/backnumber-entertainment.html")
+    ("cinema" "シネマ" "entertainment/cinema/news/backnumber-cinema.html")
+    ("general" "社会" "general/news/backnumber-general.html")))
+
 (defvar shimbun-nikkansports-content-start
-  "<!--emacs-w3m-shimbun-nikkansports-content-start-->")
+  "<[\t\n ]*![\t\n ]*-+[\t\n ]*\\++[\t\n ]*\
+ニュース本文[\t\n ]*\\++[\t\n ]*-+[\t\n ]*>[\t\n ]*\
+\\(?:\\(?:<[\t\n ]*/?[\t\n ]*[ads][^>]+>\
+\\|<[\t\n ]*h[0-9]+[\t\n ]*>[^<]+<[\t\n ]*/[\t\n ]*h[0-9]+[\t\n ]*>\\)\
+\[\t\n ]*\\)*")
+
 (defvar shimbun-nikkansports-content-end
-  "<!--emacs-w3m-shimbun-nikkansports-content-end-->")
+  "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+<[\t\n ]*![\t\n ]*-+[\t\n ]*/[\t\n ]*\\++[\t\n ]*\
+ニュース本文[\t\n ]*\\++[\t\n ]*-+[\t\n ]*>")
+
 (defvar shimbun-nikkansports-expiration-days 17)
 
-(defvar shimbun-nikkansports-end-of-header-regexp
-  (concat "\n<!--\\("
-	  " End of Header "	"\\|"
-	  "header"		"\\|"
-	  "◆◆◆◆◆◆ここまでヘッダー◆◆◆◆◆◆"
-	  "\\)-->\n")
-  "*Regexp used to look for the end of the header in a html contents.")
+(defvar shimbun-nikkansports-x-face-alist
+  '(("default" . "\
+Face: iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAADFBMVEUDKpy11PIeeNv///+
+ PA1z5AAAAP0lEQVQI12NgAAMOJgYG/n/2Fxj4a+0+MPDH2i4AEvYPgAQ3iLvvB5DYCyL0LzCsAgI
+ kYm3u+yqGte9Td4G5AJiKHahMk6/LAAAAAElFTkSuQmCC")))
 
 (luna-define-method shimbun-groups ((shimbun shimbun-nikkansports))
   (mapcar 'car shimbun-nikkansports-group-table))
@@ -70,95 +95,71 @@
 		shimbun-nikkansports-group-table)))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-nikkansports))
-  (concat (shimbun-url-internal shimbun)
-	  (nth 2 (assoc (shimbun-current-group-internal shimbun)
-			shimbun-nikkansports-group-table))))
+  (shimbun-expand-url (nth 2 (assoc (shimbun-current-group-internal shimbun)
+				    shimbun-nikkansports-group-table))
+		      shimbun-nikkansports-url))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-nikkansports)
 					 &optional range)
-;;;<DEBUG>
-;;  (shimbun-nikkansports-get-headers shimbun))
-;;
-;;(defun shimbun-nikkansports-get-headers (shimbun)
-;;;</DEBUG>
-  (when (re-search-forward shimbun-nikkansports-end-of-header-regexp nil t)
-    (delete-region (point-min) (point))
-    (when (re-search-forward
-	   "\n<!--\\( Start of Footer \\|footer-\\)-->\n" nil t)
-      (forward-line -1)
-      (delete-region (point) (point-max))
-      (goto-char (point-min))
-      (let* ((case-fold-search t)
-	     (group (shimbun-current-group-internal shimbun))
-	     (from (concat shimbun-nikkansports-server-name " ("
-			   (nth 1 (assoc group
-					 shimbun-nikkansports-group-table))
-			   ")"))
-	     year month day headers)
-	(while (re-search-forward
-		(eval-when-compile
-		  (concat
-		   "<li><a href=\"/"
-		   ;; 1. url
-		   "\\("
-		   "[^>]+"
-		   ;; 2. year
-		   "\\([0-9][0-9]\\)"
-		   ;; 3. month
-		   "\\([0-9][0-9]\\)"
-		   ;; 4. day
-		   "\\([0-9][0-9]\\)"
-		   "-"
-		   ;; 5. serial number
-		   "\\([0-9]+\\)"
-		   "\\.html\\)"
-		   "\">"
-		   ;; 6. subject
-		   "\\([^<]+\\)"
-		   "</a>\\([^<]+［[0-3]?[0-9]日"
-		   ;; 8. hour:minute
-		   "\\([012]?[0-9]:[0-5]?[0-9]\\)"
-		   "］\\)?"))
-		nil t)
-	  (setq year (string-to-number (match-string 2))
-		month (string-to-number (match-string 3))
-		day (string-to-number (match-string 4)))
-	  (push (shimbun-create-header
-		 0
-		 (match-string 6)
-		 from
-		 (shimbun-make-date-string year month day (match-string 8))
-		 (format "<20%02d%02d%02d%s.%s%%nikkansports.com>"
-			 year month day (match-string 5) group)
-		 "" 0 0
-		 (concat (shimbun-url-internal shimbun)
-			 (match-string 1)))
-		headers))
-	(shimbun-sort-headers headers)))))
-
-(luna-define-method shimbun-make-contents
-  :before ((shimbun shimbun-nikkansports) header)
-;;;<DEBUG>
-;;  (shimbun-nikkansports-prepare-article shimbun header))
-;;
-;;(defun shimbun-nikkansports-prepare-article (shimbun header)
-;;;</DEBUG>
-  (let ((case-fold-search t)
-	start)
-    (when (or (re-search-forward "<img[\t\n ]+[^>]*class=\"photo\"" nil t)
-	      (re-search-forward "<p[\t\n ]+class=\"txt2h\">" nil t))
-      (setq start (match-beginning 0))
-      (goto-char (point-max))
-      (when (and (re-search-backward "<p[\t\n ]+class=\"txt2h\">" nil t)
-		 (search-forward "</p>" nil t))
-	(save-restriction
-	  (narrow-to-region start (point))
-	  (shimbun-break-long-japanese-lines)
-	  (goto-char (point-min))
-	  (insert shimbun-nikkansports-content-start)
-	  (goto-char (point-max))
-	  (insert shimbun-nikkansports-content-end)))
-      (goto-char (point-min)))))
+  (shimbun-nikkansports-get-headers shimbun range))
+
+(defun shimbun-nikkansports-get-headers (shimbun range)
+  (let ((regexp
+	 (eval-when-compile
+	   (concat
+	    "<a[\t ]+href=\""
+	    ;; 1. url
+	    "\\([^\"]+/"
+	    ;; 2. serial number
+	    "\\([^/]+"
+	    ;; 3. year
+	    "\\(20[0-9][0-9]\\)"
+	    ;; 4. month
+	    "\\([01][0-9]\\)"
+	    ;; 5. day
+	    "\\([0-3][0-9]\\)"
+	    "[^.]+\\)\\.html\\)\">[\t ]*"
+	    ;; 6. subject
+	    "\\([^<]+\\)"
+	    "[\t ]*</a>[^\n]+\\[[\t ]*[0-9]+日[\t ]*"
+	    ;; 7. time
+	    "\\([012][0-9]:[0-5][0-9]\\)"
+	    "[\t ]*\\]")))
+	(group (shimbun-current-group-internal shimbun))
+	(from (concat shimbun-nikkansports-server-name " ("
+		      (shimbun-current-group-name shimbun) ")"))
+	(case-fold-search t)
+	headers)
+    (setq group (mapconcat 'identity
+			   (nreverse (split-string group "\\."))
+			   "."))
+    (while (re-search-forward regexp nil t)
+      (push (shimbun-create-header
+	     0 (match-string 6) from
+	     (shimbun-make-date-string
+	      (string-to-number (match-string 3))
+	      (string-to-number (match-string 4))
+	      (string-to-number (match-string 5))
+	      (match-string 7))
+	     (concat "<"
+		     (mapconcat 'identity
+				(save-match-data
+				  (split-string (match-string 2) "-"))
+				".")
+		     "%" group ".nikkansports.com>")
+	     "" 0 0 (match-string 1))
+	    headers))
+    (shimbun-sort-headers headers)))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun
+						     shimbun-nikkansports)
+						    header)
+  (shimbun-strip-cr)
+  (goto-char (point-min))
+  (when (luna-call-next-method)
+    (unless (shimbun-prefer-text-plain-internal shimbun)
+      (shimbun-break-long-japanese-lines))
+    t))
 
 (provide 'sb-nikkansports)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-nikkei.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-nikkei.el
--- work/emacs-w3m-1.4.4/shimbun/sb-nikkei.el	2005-03-10 20:21:08.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-nikkei.el	2011-10-13 19:25:41.000000000 +0900
@@ -1,9 +1,9 @@
 ;;; sb-nikkei.el --- shimbun backend for nikkei.co.jp -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; Kazuyoshi KOREEDA <Kazuyoshi.Koreeda@rdmg.mgcs.mei.co.jp>
+;; Copyright (C) 2001-2007, 2009-2011
+;; Kazuyoshi KOREEDA <Koreeda.Kazuyoshi@jp.panasonic.com>
 
-;; Author: Kazuyoshi KOREEDA <Kazuyoshi.Koreeda@rdmg.mgcs.mei.co.jp>,
+;; Author: Kazuyoshi KOREEDA <Koreeda.Kazuyoshi@jp.panasonic.com>,
 ;;         Katsumi Yamaoka   <yamaoka@jpl.org>,
 ;;         NOMIYA Masaru     <nomiya@ttmy.ne.jp>
 ;; Keywords: news
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -33,9 +33,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 
 (luna-define-class shimbun-nikkei (shimbun-japanese-newspaper shimbun) ())
@@ -63,64 +60,151 @@
     ("tento" "ベンチャー" ,(concat shimbun-nikkei-url "news/tento/")
      shimbun-nikkei-get-headers-default2
      shimbun-nikkei-prepare-article-default2)
-    ("zinzi" "トップ人事" ,(concat shimbun-nikkei-url "news/zinzi/")
-     shimbun-nikkei-get-headers-default2
-     shimbun-nikkei-prepare-article-default2)
-    ("report" "日経の調査" ,(concat shimbun-nikkei-url "report/")
-     shimbun-nikkei-get-headers-report
-     shimbun-nikkei-prepare-article-report)
     ("kansai" "関西" ,(concat shimbun-nikkei-url "kansai/")
      shimbun-nikkei-get-headers-kansai
      shimbun-nikkei-prepare-article-kansai)
-    ("it" "IT" "http://it.nikkei.co.jp/it/news/"
-     shimbun-nikkei-get-headers-it
+    ("it.business" "ITビジネス"
+     "http://it.nikkei.co.jp/business/news/index.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.busi_gyoukai" "業界動向(ITビジネス)"
+     "http://it.nikkei.co.jp/business/news/busi_gyoukai.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.biz-system" "企業情報システム"
+     "http://it.nikkei.co.jp/business/news/busi_system.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.sox" "盛り上がるＳＯＸ法ビジネス"
+     "http://it.nikkei.co.jp/business/special/sox.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.data" "データで読むＩＴ市場"
+     "http://it.nikkei.co.jp/business/column/data.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.taidan" "トップ対談"
+     "http://it.nikkei.co.jp/business/column/taidan.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.internet" "インターネット"
+     "http://it.nikkei.co.jp/internet/news/index.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.broad" "ブロードバンド"
+     "http://it.nikkei.co.jp/internet/news/broadband.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.net_gyoukai" "業界動向(インターネット)"
+     "http://it.nikkei.co.jp/internet/news/net_gyoukai.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.iptel" "多機能化するＩＰ電話"
+     "http://it.nikkei.co.jp/internet/special/iptel.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.tele" "放送・ネット融合"
+     "http://it.nikkei.co.jp/internet/special/tele.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.broadcast" "地上デジタル放送"
+     "http://it.nikkei.co.jp/internet/special/d_broadcast.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.internet-column" "インターネット:コラム"
+     "http://it.nikkei.co.jp/internet/column/koike.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.contents" "コンテンツビジネス"
+     "http://it.nikkei.co.jp/internet/column/contents.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.ec" "EC"
+     "http://it.nikkei.co.jp/internet/news/ec.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.policy" "政策・統計"
+     "http://it.nikkei.co.jp/internet/news/seisaku.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.e-gov" "行政のＩＴ化"
+     "http://it.nikkei.co.jp/business/special/e-gov.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.mobile" "モバイル"
+     "http://it.nikkei.co.jp/mobile/news/index.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.mob_gyoukai" "業界動向(モバイル)"
+     "http://it.nikkei.co.jp/mobile/news/gyoukai.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.mobsoft" "サービス"
+     "http://it.nikkei.co.jp/mobile/news/soft.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.mobcon" "コンテンツ"
+     "http://it.nikkei.co.jp/mobile/news/contents.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.money" "携帯キャリアの金融ビジネス"
+     "http://it.nikkei.co.jp/mobile/special/money.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.one" "ワンセグはテレビを変えるか"
+     "http://it.nikkei.co.jp/mobile/special/one.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.security" "セキュリティ"
+     "http://it.nikkei.co.jp/security/news/index.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.net_crime" "ネット犯罪"
+     "http://it.nikkei.co.jp/security/news/net_crime.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.digital" "デジタル家電＆エンタメ"
+     "http://it.nikkei.co.jp/digital/news/index.aspx"
+     shimbun-nikkei-get-headers-it-default
+     shimbun-nikkei-prepare-article-default)
+    ("it.pc" "PC＆デジタルカメラ"
+     "http://it.nikkei.co.jp/pc/news/index.aspx"
+     shimbun-nikkei-get-headers-it-pc
      shimbun-nikkei-prepare-article-default2)
-    ("it.zensen" "IT最前線"
-     "http://it.nikkei.co.jp/it/column/zensen.cfm?ichiran=true"
-     shimbun-nikkei-get-headers-it-zensen
-     shimbun-nikkei-prepare-article-default)
-    ("it.manage" "ITニュースの焦点"
-     "http://it.nikkei.co.jp/it/manage/foc.cfm?ichiran=true"
-     shimbun-nikkei-get-headers-it-manage
-     shimbun-nikkei-prepare-article-default)
-    ("it.seisaku" "IT政策" "http://it.nikkei.co.jp/it/news/seisaku.cfm"
-     shimbun-nikkei-get-headers-it-seisaku
-     shimbun-nikkei-prepare-article-default)
-    ("it.digicore" "デジタルコア・レポート"
-     "http://it.nikkei.co.jp/it/column/digicore.cfm?ichiran=true"
-     shimbun-nikkei-get-headers-it-digicore
-     shimbun-nikkei-prepare-article-default)
-    ("kokunai" "市場概況" "http://markets.nikkei.co.jp/kokunai/summary.cfm"
-     shimbun-nikkei-get-headers-kawase
-     shimbun-nikkei-prepare-article-default3)
-    ("markets" "海外株概況" "http://markets.nikkei.co.jp/kaigai/summary.cfm"
-     shimbun-nikkei-get-headers-markets
-     shimbun-nikkei-prepare-article-default3)
-    ("kawase" "為替概況" "http://markets.nikkei.co.jp/kawase/summary.cfm"
-     shimbun-nikkei-get-headers-kawase
-     shimbun-nikkei-prepare-article-default3)
+    ("kokunai" "市場概況" "http://markets.nikkei.co.jp/kokunai/summary.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
+    ("markets" "海外株概況" "http://markets.nikkei.co.jp/kaigai/summary.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
+    ("kawase" "為替概況" "http://markets.nikkei.co.jp/kawase/summary.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
     ("kinri" "短期金利・債権・ＣＢ概況"
-     "http://markets.nikkei.co.jp/kawase/kinri.cfm"
-     shimbun-nikkei-get-headers-kinri
-     shimbun-nikkei-prepare-article-default3)
+     "http://markets.nikkei.co.jp/kawase/kinri.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
     ("ft" "英フィナンシャル・タイムズ"
-     "http://markets.nikkei.co.jp/kaigai/ft.cfm"
+     "http://markets.nikkei.co.jp/kaigai/ft.aspx"
      shimbun-nikkei-get-headers-ft
-     shimbun-nikkei-prepare-article-default3)
-    ("dj" "米ダウ・ジョーンズ" "http://markets.nikkei.co.jp/kaigai/dj.cfm"
+     shimbun-nikkei-prepare-article-default4)
+    ("dj" "米ダウ・ジョーンズ" "http://markets.nikkei.co.jp/kaigai/dj.aspx"
      shimbun-nikkei-get-headers-dj
-     shimbun-nikkei-prepare-article-default3)
+     shimbun-nikkei-prepare-article-default4)
     ("ngyoseki" "企業業績ニュース"
-     "http://markets.nikkei.co.jp/kokunai/gyoseki.cfm"
-     shimbun-nikkei-get-headers-gyoseki
-     shimbun-nikkei-prepare-article-default3)
+     "http://markets.nikkei.co.jp/kokunai/gyoseki.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
     ("gyosuuchi" "業績数値"
-     "http://markets.nikkei.co.jp/kokunai/bunkatsu3.cfm?genre=m4"
-     shimbun-nikkei-get-headers-bunkatsu2
-     shimbun-nikkei-prepare-article-bunkatsu2)
-    ("gyoseki" "海外企業業績" "http://markets.nikkei.co.jp/kaigai/gyoseki.cfm"
-     shimbun-nikkei-get-headers-gyoseki
-     shimbun-nikkei-prepare-article-default3)
+     "http://markets.nikkei.co.jp/kokunai/bunkatsu2.aspx?genre=m4"
+     shimbun-nikkei-get-headers-gyosuuchi
+     shimbun-nikkei-prepare-article-default4)
+    ("gyoseki" "海外企業業績" "http://markets.nikkei.co.jp/kaigai/gyoseki.aspx"
+     shimbun-nikkei-get-headers-stock
+     shimbun-nikkei-prepare-article-default4)
+    ("china" "中国ビジネス事情" ,(concat shimbun-nikkei-url "china/news/")
+     shimbun-nikkei-get-headers-china
+     shimbun-nikkei-prepare-article-default4)
     ("market" "株・為替" ,(concat shimbun-nikkei-url "news/market/")
      shimbun-nikkei-get-headers-market
      shimbun-nikkei-prepare-article-market)
@@ -135,7 +219,7 @@
      shimbun-nikkei-prepare-article-default)
     ("retto" "地域経済" ,(concat shimbun-nikkei-url "news/retto/")
      shimbun-nikkei-get-headers-retto
-     shimbun-nikkei-prepare-article-default2)
+     shimbun-nikkei-prepare-article-default4)
     ("sports" "スポーツ" "http://sports.nikkei.co.jp/"
      shimbun-nikkei-get-headers-sports
      shimbun-nikkei-prepare-article-sports)
@@ -145,24 +229,236 @@
     ("release" "プレスリリース" "http://release.nikkei.co.jp/"
      shimbun-nikkei-get-headers-release
      shimbun-nikkei-prepare-article-release)
-    ("shasetsu" "社説・春秋" ,(concat shimbun-nikkei-url "news/shasetsu/")
+    ("release.it.comp" "プレスリリース(ＩＴ；コンピューター)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=1"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.peri" "プレスリリース(ＩＴ；周辺機器)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=2"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.sys" "プレスリリース(ＩＴ；システム・ソフト開発)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=3"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.cont" "プレスリリース(ＩＴ；情報・コンテンツ)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=4"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.net" "プレスリリース(ＩＴ；通信・インターネット)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=5"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.lsi" "プレスリリース(ＩＴ；半導体)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=6"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.game" "プレスリリース(ＩＴ；ゲーム・娯楽)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=7"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.it.etc" "プレスリリース(ＩＴ；その他ＩＴ関連)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=1&sindID=8"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.depart" "プレスリリース(流通；百貨店・スーパー)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=9"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.ryohan" "プレスリリース(流通；量販店)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=10"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.zakka" "プレスリリース(流通；生活雑貨)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=11"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.cosme" "プレスリリース(流通；医薬品・化粧品)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=12"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.car" "プレスリリース(流通；自動車)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=13"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.book" "プレスリリース(流通；書籍)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=14"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.record" "プレスリリース(流通；レコード・ゲーム)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=15"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.food" "プレスリリース(流通；食品・飲料)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=16"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.mercha" "プレスリリース(流通；商社・卸売業)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=17"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.mail" "プレスリリース(流通；通信・訪問販売)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=18"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.netshop" "プレスリリース(流通；ネットショッピング)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=19"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.dist.etc" "プレスリリース(流通；その他商業)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=2&sindID=20"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.money.bank" "プレスリリース(金融；銀行・信金)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=3&sindID=57"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.money.sec" "プレスリリース(金融；証券会社)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=3&sindID=58"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.money.am" "プレスリリース(金融；投資信託運用会社)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=3&sindID=59"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.money.insu" "プレスリリース(金融；保険会社)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=3&sindID=60"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.money.etc" "プレスリリース(金融；その他金融)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=3&sindID=61"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.chemi" "プレスリリース(メーカー；化学・医薬品)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=31"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.mecha" "プレスリリース(メーカー；機械・金属)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=32"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.car" "プレスリリース(メーカー；自動車・自動車部品)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=33"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.elec" "プレスリリース(メーカー；家電・電機)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=34"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.food" "プレスリリース(メーカー；食品・飲料)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=35"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.sports" "プレスリリース(メーカー；スポーツ・娯楽用品)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=36"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.apparel" "プレスリリース(メーカー；アパレル・生活用品)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=37"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.commu" "プレスリリース(メーカー；通信機器・精密機械)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=38"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.maker.etc" "プレスリリース(メーカー；その他メーカー)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=4&sindID=39"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.medic" "プレスリリース(サービス；医療・福祉)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=40"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.rest" "プレスリリース(サービス；飲食)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=41"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.trans" "プレスリリース(サービス；運輸・運送)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=42"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.energy" "プレスリリース(サービス；エネルギー)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=43"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.enter" "プレスリリース(サービス；エンターテインメント)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=44"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.env" "プレスリリース(サービス；環境)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=45"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.consul" "プレスリリース(サービス；コンサルティング)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=46"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.edu" "プレスリリース(サービス；教育・研修)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=47"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.haken" "プレスリリース(サービス；人材派遣)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=48"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.life" "プレスリリース(サービス；生活関連)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=49"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.media" "プレスリリース(サービス；メディア)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=50"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.lease" "プレスリリース(サービス；リース)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=51"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.travel" "プレスリリース(サービス；旅行・ホテル)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=52"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.service.etc" "プレスリリース(サービス；その他サービス業)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=53"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.const.const" "プレスリリース(サービス；建設・土木)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=6&sindID=54"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.const.house" "プレスリリース(サービス；住宅)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=6&sindID=56"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("release.const.etc" "プレスリリース(サービス；その他建設関連)"
+     "http://release.nikkei.co.jp/isclassList.cfm?lindID=5&sindID=53"
+     shimbun-nikkei-get-headers-release2
+     shimbun-nikkei-prepare-article-release2)
+    ("shasetsu" "社説・春秋"
+     "http://www.nikkei.co.jp/news/shasetsu/childKijiIchiran.js"
+     ;; The contents of IndexKijiIchiran.js will be appended afterward.
      shimbun-nikkei-get-headers-shasetsu
-     shimbun-nikkei-prepare-article-default)
-    ("okuyami" "おくやみ" ,(concat shimbun-nikkei-url "news/okuyami/")
-     shimbun-nikkei-get-headers-okuyami
-     shimbun-nikkei-prepare-article-okuyami))
+     shimbun-nikkei-prepare-article-default))
   "Alist of group names and parameters.
 Each parameters include a Japanese group name, an index page, a
 function used to get headers and a function used to prepare an article.")
 
 (defvar shimbun-nikkei-server-name "日本経済新聞")
-(defvar shimbun-nikkei-from-address "webmaster@nikkei.co.jp")
+(defvar shimbun-nikkei-from-address "nobody@example.com")
 (defvar shimbun-nikkei-content-start
   "<!--emacs-w3m-shimbun-nikkei-content-start-->")
 (defvar shimbun-nikkei-content-end
   "<!--emacs-w3m-shimbun-nikkei-content-end-->")
 (defvar shimbun-nikkei-x-face-alist
   '(("default" . "\
+Face: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAABGdBTUEAALGPC/xhBQAAAA9
+ QTFRF////AY8ACZYCg8p7////e1VqQQAAAAlwSFlzAAAOnAAADsQBdfaEgQAAACh0RVh0U29mdHd
+ hcmUAWFYgVmVyc2lvbiAzLjEwYSAgUmV2OiAxMi8yOS85NFhtieMAAADcSURBVCjPXZHhkcUgCIS
+ 9vAouaUDRAqKPCnT7r+lYTGLm+LffsLADIXh9RM7wKvH6p/MiG3XSdhNqExi7xMcw5ADuMfSjFqC
+ KxstR0BXoB87LUTAIFH2CZIoABNsCXwNxhrCJDcg3SL+2s6rNRIvBIuVv08GkjBIYgoZU6oHmwLR
+ tHWptOwEbfAOjEhQHTMoGCVUn2IHkV/qZYKTS2RAfIKWLg+2yJL1AmENb0jkzhLlW5AHuMWFjZB4
+ 1q+24bhrXl7IHXW8RP3Jcj+HRurxfycnn67m+/PX+j976D3rKSsvKwOwqAAAAB3RJTUUH1wgDChM
+ rIe5fHAAAAABJRU5ErkJggg==")
+    ("\\`release" . "\
 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAWAgMAAAD7mfc/AAAABGdBTUEAALGPC/xhBQAAAAx
  QTFRFBjKeZ4rcxdHp+/z7lhoK9wAAAC90RVh0U29mdHdhcmUAWFYgVmVyc2lvbiAzLjEwYStGTG1
  hc2sgIFJldjogMTIvMjkvOTQbx6p8AAABBUlEQVR4nD3MIU/DQBwF8D8d62W9wGqalYRSREUV9xX
@@ -170,19 +466,7 @@
  uZOiZYHJoUMb5y3twhhSFnZHR2NjZz7hHIGkyiJFMP8FCILhpIiqKp+EthkqMLMQ3TUD2Y8jEyQi
  LuLFJ6wMVrjsWRgvOPYFEBqEvjSuAcwJK55uVuv7Qs7n6xzYlSWrYoNHn6YV1cJ06Gh2LvCOs5Eo
  jZ9Gph5VYg57fTN0Q/I1Gx+bDw9BZcP22ZQ8WPBKVadTs6xiKlaIaOdv70SssB7/oy7JbxPXlcqJ
- +AFOYhEr5ENrbAAAAB3RJTUUH1AQGFzot7I86fAAAAABJRU5ErkJggg==")
-    ("release" . "\
-Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAATBAMAAAAkFJMsAAAABGdBTUEAALGPC/xhBQAAABJ
- QTFRFAAAAZI9jnMGYtNiv1+3U////kl1YDAAAAC90RVh0U29mdHdhcmUAWFYgVmVyc2lvbiAzLjE
- wYStGTG1hc2sgIFJldjogMTIvMjkvOTQbx6p8AAABM0lEQVR4nDVRQZKEIAwMg97DoHddnTsI3NG
- BOwj5/1c2WzvTKZJ0NZWiA/hVCsewf5mPAUAAEOAOoVFrZ7V6OrdZ+IcANVFRtNEP2UChP3LNRHW
- ugDPVB000cJzhngnoVJgLqEBtanMbe26Qb4oP4klkQJHvcwllblQEdVpGSkmzKEhSiDnmMveJkLi
- 4Y+wAsgtijmRGmknkxuNhrAJelQXJAZKoPQLRfWAoAvYI/hwu+QZIKWqfGIvH578d9bW1HZ/uyf7
- F+pcQEBfl3MrXmD7h1fXBnVqEzNemmxWoEEHDPOxpX/3xxsFUb6sz0mqrN3jl4eq1uYZDKr3WkPS
- VbK8QYMBqXNxxWMpti1fTpettwLPgTcIEEs/dxClO5xQ970ogfMGv+TL+D/UVhFBKreuH/QJ8OEG
- oiorzBAAAAAd0SU1FB9QECQYoFI75G7YAAABodEVYdENvbW1lbnQAQ1JFQVRPUjogWFYgVmVyc2l
- vbiAzLjEwYStGTG1hc2sgIFJldjogMTIvMjkvOTQKQ1JFQVRPUjogWFYgVmVyc2lvbiAzLjEwYSt
- GTG1hc2sgIFJldjogMTIvMjkvOTQKYD1XBQAAAABJRU5ErkJggg==")))
+ +AFOYhEr5ENrbAAAAB3RJTUUH1AQGFzot7I86fAAAAABJRU5ErkJggg==")))
 
 (defvar shimbun-nikkei-expiration-days 7)
 
@@ -199,147 +483,170 @@
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-nikkei)
 					 &optional range)
-  (let* ((group (shimbun-current-group-internal shimbun))
+  (let* ((case-fold-search t)
+	 (group (shimbun-current-group-internal shimbun))
 	 (fn (nth 3 (assoc group shimbun-nikkei-group-table)))
-	 (shimbun-nikkei-from-address (shimbun-from-address shimbun))
-	 (case-fold-search t))
+	 (shimbun-nikkei-from-address
+	  (concat (shimbun-server-name shimbun)
+		  " (" (shimbun-current-group-name shimbun) ")"))
+	 (folder (nth 2 (assoc group shimbun-nikkei-group-table))))
+    (when (and (not (string-match "\\`http://markets\\.nikkei\\.co\\.jp/"
+				  folder))
+	       (or (member group '("kaigai" "seiji"))
+		   (not (eq (aref folder (1- (length folder))) ?/)))
+	       (string-match "[^/]/[^/]\\|[^/]/\\'" folder))
+      (setq folder (substring folder 0 (+ (match-beginning 0) 2))))
     (while (search-forward "\r" nil t)
-      (delete-backward-char 1))
+      (delete-char -1))
     (goto-char (point-min))
     (when (fboundp fn)
-      (funcall fn group (nth 2 (assoc group shimbun-nikkei-group-table))))))
+      (shimbun-sort-headers (funcall fn group folder shimbun range)))))
 
 (defun shimbun-nikkei-expand-url (url folder)
   "Make a fullname of URL relative to FOLDER.
 If URL begins with `http://', FOLDER is ignored."
   (save-match-data
-    (cond ((string-match "\\`http://" url)
+    (cond ((string-match "=http://" url)
+	   (substring url (1+ (match-beginning 0))))
+	  ((string-match "\\`http://" url)
 	   url)
 	  ((string-match "\\`/" url)
-	   (concat folder (substring url 1)))
+	   (shimbun-expand-url url shimbun-nikkei-url))
 	  (t
 	   (concat folder url)))))
 
-(defun shimbun-nikkei-make-date-string (&rest args)
-  "Run `shimbun-make-date-string' with ARGS and fix a day if needed.
-
-\(shimbun-nikkei-make-date-string YEAR MONTH DAY &optional TIME TIMEZONE)"
+(defun shimbun-nikkei-make-date-string (year month day
+					     &optional time timezone adj)
+  "Run `shimbun-make-date-string' and fix a day if needed.
+Optional ADJ is the number of days that adjust the day of month."
   (save-match-data
-    (let* ((ctime (current-time))
-	   (date (apply 'shimbun-make-date-string args))
-	   (time (shimbun-time-parse-string date))
-	   (ms (car time))
-	   (ls (cadr time))
-	   (system-time-locale "C"))
-      (if (or (> ms (car ctime))
-	      (and (= ms (car ctime))
-		   (> ls (cadr ctime))))
-	  ;; It should be yesterday's same time.
-	  (progn
-	    (setq ms (1- ms))
-	    (when (< (setq ls (- ls (eval-when-compile
-				      (- (* 60 60 24) 65536))))
-		     0)
-	      (setq ms (1- ms)
-		    ls (+ ls 65536)))
-	    (format-time-string "%a, %d %b %Y %R +0900" (list ms ls)))
-	date))))
+    (let ((ctime (current-time))
+	  (date (shimbun-make-date-string year month day time timezone))
+	  (system-time-locale "C")
+	  ms ls)
+      (setq time (shimbun-time-parse-string date)
+	    ms (car time)
+	    ls (cadr time))
+      (when adj
+	(setq ls (+ ls (* adj (eval-when-compile (* 60 60 24))))
+	      ms (+ (/ ls 65536) ms)
+	      ls (mod ls 65536)))
+      (cond ((or (> ms (car ctime))
+		 (and (= ms (car ctime))
+		      (> ls (cadr ctime))))
+	     ;; It should be the same time yesterday.
+	     (setq ms (1- ms))
+	     (when (< (setq ls (- ls (eval-when-compile
+				       (- (* 60 60 24) 65536))))
+		      0)
+	       (setq ms (1- ms)
+		     ls (+ ls 65536)))
+	     (format-time-string "%a, %d %b %Y %R +0900" (list ms ls)))
+	    (adj
+	     (format-time-string "%a, %d %b %Y %R +0900" (list ms ls)))
+	    (t
+	     date)))))
 
-(defun shimbun-nikkei-get-headers-default (group folder &optional headers)
+(defvar shimbun-nikkei-tmp-ids nil)
+(defvar shimbun-nikkei-tmp-subjects nil)
+
+(defun shimbun-nikkei-get-headers-default (group folder shimbun range
+						 &optional headers)
   "Default function used to fetch headers.
 GROUP is a group name.  FOLDER is a parent url.
 If HEADERS is non-nil, it is appended to newly fetched headers."
-  (while (re-search-forward
-	  (eval-when-compile
-	    (let ((s0 "[\t\n ]*")
-		  (s1 "[\t\n ]+"))
-	      (concat "<a" s1 "href=\""
-		      ;; 1. url
-		      "\\(\\([^\"<>]+/\\)?"
-		      ;; 3. serial number
-		      "\\("
-		      ;; 4. year
-		      "\\(20[0-9][0-9]\\)"
-		      ;; 5. month
-		      "\\([01][0-9]\\)"
-		      ;; 6. day
-		      "\\([0-3][0-9]\\)"
-		      "[0-9a-z]+\\)"
-		      "\\.html\\)\"" s0 ">\\(" s0 "<[^<>]+>" s0 "\\)*" s0
-		      ;; 8. subject
-		      "\\([^<>]+\\)"
-		      "\\(" s0 "<[^<>]+>" s0 "\\)*"
-		      "("
-		      ;; 10. hour:minute
-		      "\\([012][0-9]:[0-5][0-9]\\)"
-		      ")")))
-	  nil t)
-    (push (shimbun-create-header
-	   0
-	   (match-string 8)
-	   shimbun-nikkei-from-address
-	   (shimbun-nikkei-make-date-string
-	    (string-to-number (match-string 4))
-	    (string-to-number (match-string 5))
-	    (string-to-number (match-string 6))
-	    (match-string 10))
-	   (concat "<" (match-string 3) "%" group "."
-		   shimbun-nikkei-top-level-domain ">")
-	   "" 0 0
-	   (shimbun-nikkei-expand-url (match-string 1) folder))
-	  headers))
-  (shimbun-sort-headers headers))
+  (unless headers
+    (setq shimbun-nikkei-tmp-ids nil
+	  shimbun-nikkei-tmp-subjects nil))
+  (let (next time url subject serial day month year category id)
+    (goto-char (point-min))
+    (while (re-search-forward "<span\\(?:[\t\n ]+[^>]+\\)?>\
+\[\t\n ]*(\\([012][0-9]:[0-5][0-9]\\))[\t\n ]*</span>"
+			      nil t)
+      (setq next (match-end 0)
+	    time (match-string 1))
+      (when (and (re-search-backward "<a[\t\n ]+href=\"\\([^\"]+\\)\"[^>]*>\
+\[\t\n ]*\\(?:<![^>]+>[\t\n ]*\\)*\\([^\n<]+\\)\\(?:[\t\n ]*<![^>]+>\\)*\
+\[\t\n ]*</a>"
+				     nil t)
+		 (progn
+		   (setq url (match-string 1)
+			 subject (match-string 2))
+		   (when (string-match "[\t\n ]+\\'" url)
+		     (setq url (substring url 0 (match-beginning 0))))
+		   (or (and (string-match "\
+\\(?:/20[0-9][0-9][01][0-9][0-3][0-9]\\|/index\\.aspx\\?n=\\)\
+\\(.+\\)\\([0-3][0-9]\\)\\([01][0-9]\\)\\(20[0-9][0-9]\\)" url)
+			    (prog1 t
+			      (setq serial (downcase (match-string 1 url))
+				    day (match-string 2 url)
+				    month (match-string 3 url)
+				    year (match-string 4 url))))
+		       (and (string-match "\
+\\(20[0-9][0-9]\\)\\([01][0-9]\\)\\([0-3][0-9]\\)\\([^\n\t ./=]+\\)" url)
+			    (prog1 t
+			      (setq year (match-string 1 url)
+				    month (match-string 2 url)
+				    day (match-string 3 url)
+				    serial (downcase (match-string 4 url)))))))
+		 (and (string-match "\
+\\`http://\\([^\t\n ./]+\\)\\.nikkei\\.co\\.jp/\\(?:\\([^\t\n /]+\\)/news/\\)?\
+\\|\\`/news/\\([^\t\n /]+\\)/" url)
+		      (prog1 t
+			(setq category (if (match-beginning 2)
+					   (concat (match-string 2 url) "."
+						   (match-string 1 url))
+					 (or (match-string 1 url)
+					     (match-string 3 url))))))
+		 (progn
+		   (setq id (concat "<" year month day "."
+				    (shimbun-subst-char-in-string ?  ?_ serial)
+				    "%" category "." group "."
+				    shimbun-nikkei-top-level-domain ">"))
+		   (not (or (member id shimbun-nikkei-tmp-ids)
+			    (and (>= (length subject) 16)
+				 (member subject
+					 shimbun-nikkei-tmp-subjects))))))
+	(push id shimbun-nikkei-tmp-ids)
+	(push subject shimbun-nikkei-tmp-subjects)
+	(push (shimbun-create-header
+	       0 subject shimbun-nikkei-from-address
+	       (shimbun-nikkei-make-date-string
+		(string-to-number year)
+		(string-to-number month)
+		(string-to-number day)
+		time)
+	       id "" 0 0
+	       (shimbun-nikkei-expand-url url folder))
+	      headers))
+      (goto-char next))
+    headers))
 
-(defun shimbun-nikkei-get-headers-top (group folder)
+(defun shimbun-nikkei-get-headers-top (group folder shimbun range)
   "Function used to fetch headers for the `top' group."
+  (setq shimbun-nikkei-tmp-ids nil)
+  (setq shimbun-nikkei-tmp-subjects nil)
   (let (headers)
-    (when (re-search-forward
-	   (eval-when-compile
-	     (let ((s0 "[\t\n ]*")
-		   (s1 "[\t\n ]+"))
-	       (concat "<a" s1 "href=\"/?"
-		       ;; 1. url
-		       "\\([^\"]+/"
-		       ;; 2. serial number
-		       "\\("
-		       ;; 3. year
-		       "\\(20[0-9][0-9]\\)"
-		       ;; 4. month
-		       "\\([01][0-9]\\)"
-		       ;; 5. day
-		       "\\([0-3][0-9]\\)"
-		       "[0-9a-z]+\\)"
-		       "\\.html\\)"
-		       ".+>" s0
-		       "<!--" s0 "FJZONE" s1 "START" s1 "NAME=\"MIDASHI\""
-		       s0 "-->" s0
-		       ;; 6. subject
-		       "\\([^<]+\\)"
-		       s0
-		       "<!--" s0 "FJZONE" s1 "END" s1 "NAME=\"MIDASHI\""
-		       s0 "-->\\(" s0 "<[^!]+>\\)*" s0
-		       "<!--" s0 "FJZONE" s1 "START" s1 "NAME=\"HONBUN\""
-		       s0 "-->[^<]+("
-		       ;; 8. hour:minute
-		       "\\([0-2][0-9]:[0-5][0-9]\\)")))
-	   nil t)
+    ;; Get headers for the retto group.
+    (while (re-search-forward "<a[\t\n ]+href=\"/\\(news/retto/\
+\\(\\(20[0-9][0-9]\\)\\([01][0-9]\\)\\([0-3][0-9]\\)\\)\\([^.]+\\)\
+\\.html\\)\">[\t\n ]*\\([^<]+\\):[\n\t 　]*\\([^<]+\\)" nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (concat "[" (match-string 7) "] " (match-string 8)) ;; subject
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 3))
 	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5))
-	      (match-string 8))
-	     (concat "<" (match-string 2) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
+	      (string-to-number (match-string 5)))
+	     (concat "<" (match-string 2) "." (downcase (match-string 6))
+		     "%retto.top." shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
 	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
-    (shimbun-nikkei-get-headers-default group folder headers)))
+    (shimbun-nikkei-get-headers-default group folder shimbun range headers)))
 
-(defun shimbun-nikkei-get-headers-default2 (group folder)
+(defun shimbun-nikkei-get-headers-default2 (group folder shimbun range)
   "Function used to fetch headers for the tento and the zinzi groups."
   (let (headers)
     (while (re-search-forward
@@ -348,111 +655,43 @@
 		    (s1 "[\t\n ]+"))
 		(concat "<a" s1 "href=\""
 			;; 1. url
-			"\\(\\([^\"<>]+/\\)?"
-			;; 3. serial number
+			"\\(\\(?:[^\"<>]+/\\)?"
+			;; 2. serial number
 			"\\("
-			;; 4. year
+			;; 3. year
 			"\\(20[0-9][0-9]\\)"
-			;; 5. month
+			;; 4. month
 			"\\([01][0-9]\\)"
-			;; 6. day
+			;; 5. day
 			"\\([0-3][0-9]\\)"
 			"[0-9a-z]+\\)"
-			"\\.html\\)\"" s0 "\\(>\\)" s0
-			;; 8. subject
+			"\\.html\\)"
+			s0 "\"" s0 ">" s0
+			;; 6. subject
 			"\\([^<>]+\\)")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 8)
+	     (match-string 6)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
+	      (string-to-number (match-string 3))
 	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5))
-	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 1) folder))
-	    headers))
-    (shimbun-sort-headers headers)))
-
-(defun shimbun-nikkei-get-headers-report (group folder)
-  "Function used to fetch headers for the report group."
-  (let ((date (if (re-search-forward
-		   (eval-when-compile
-		     (let ((s0 "[\t\n ]*")
-			   (s1 "[\t\n ]+"))
-		       (concat "<p" s1 "id=\"title_description\">"
-			       s0 "更新" s0 "[:：]" s0
-			       ;; 1. year
-			       "\\(20[0-9][0-9]\\)"
-			       "/"
-			       ;; 2. month
-			       "\\([01]?[0-9]\\)"
-			       "/"
-			       ;; 3. day
-			       "\\([0-3]?[0-9]\\)"
-			       s0 "</p>")))
-		   nil t)
-		  (prog1
-		      (shimbun-make-date-string
-		       (string-to-number (match-string 1))
-		       (string-to-number (match-string 2))
-		       (string-to-number (match-string 3)))
-		    (goto-char (point-min)))
-		(let ((cts (current-time-string)))
-		  (format "%s, %02d %s %s 00:00 +0900"
-			  (substring cts 0 3)
-			  (string-to-number (substring cts 8 10))
-			  (substring cts 4 7)
-			  (substring cts 20)))))
-	headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\"/report/"
-			;; 1. url
-			"\\("
-			;; 2. serial number
-			"\\([^\t\n ]+\\)"
-			"\\.html\\)"
-			s0 "\">" s0
-			;; 3. subject
-			"\\([^<]+\\)"
-			s0 "<")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 3)
-	     shimbun-nikkei-from-address
-	     date
-	     (concat "<" (match-string 2) "%" group "."
+	      (string-to-number (match-string 5)))
+	     (concat "<" (downcase (match-string 2)) "%" group "."
 		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
 	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     headers))
 
-(defun shimbun-nikkei-get-headers-kansai (group folder)
+(defun shimbun-nikkei-get-headers-kansai (group folder shimbun range)
   "Function used to fetch headers for the kansai group."
-  (let ((date (if (re-search-forward
-		   (eval-when-compile
-		     (let ((s0 "[\t\n ]*")
-			   (s1 "[\t\n ]+"))
-		       (concat "class=\"date\"><strong>" s0
-			       ;; 1. year
-			       "\\(20[0-9][0-9]\\)"
-			       "年"
-			       ;; 2. month
-			       "\\([01]?[0-9]\\)"
-			       "月"
-			       ;; 3. day
-			       "\\([0-3]?[0-9]\\)"
-			       "日" s0 "(" "\\([^<]+\\)" ")"
-			       s0 "</strong></td>")))
-		   nil t)
+  (let ((date (if (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"topicpath[\t\n ]+updatetime\"\
+\[^>]*>[\t\n ]*\\(20[0-9][0-9]\\)/\\([01]?[0-9]\\)/\\([0-3]?[0-9]\\)\
+\[\t\n 　]+更新[\t\n ]*</div>"
+				     nil t)
 		  (prog1
 		      (shimbun-make-date-string
 		       (string-to-number (match-string 1))
@@ -466,606 +705,344 @@
 			  (substring cts 4 7)
 			  (substring cts 20)))))
 	headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\"."
-			;; 1. url
-			"\\("
-			;; 2.
-			"\\([^\"<>]+/\\)"
-			;; 3. serial number
-			"\\([^\t\n ]+\\)\\)"
-			s0 "-frame" s0 "\\.html"
-			s0 "\">" s0
-			;; 4. subject
-			"\\([^<]+\\)"
-			s0 "<")))
-	    nil t)
+    (while (re-search-forward "<a[\t\n ]+href=\"\
+\\(news/\\(news[0-9]+\\)\\.html\\)\">[\t\n ]*\\([^<]+\\)[\t\n ]*</a>"
+			      nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 4)
+	     (match-string 3)
 	     shimbun-nikkei-from-address
 	     date
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (concat (match-string 1) ".html")
-					folder))
-	    headers))
-    headers))
-
-(defun shimbun-nikkei-get-headers-it (group folder)
-  "Function used to fetch headers for the it group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. url
-			"\\(\\./index\\.cfm\\?i="
-			;; 2. serial number
-			"\\("
-			;; 3. year
-			"\\(20[0-9][0-9]\\)"
-			;; 4. month
-			"\\([01][0-9]\\)"
-			;; 5. day
-			"\\([0-3][0-9]\\)"
-			;; 6. serial
-			"\\([0-9a-z]+\\)\\)\\)"
-			;;"\"\\)"
-			s0 "\">" s0
-			;; 7. subject
-			"\\([^<]+\\)" "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 7)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 3))
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5)))
-	     (concat "<" (match-string 2) "%" group "."
+	     (concat "<" (shimbun-subst-char-in-string
+			  ?/ ?. (downcase (match-string 2)))
+		     "%" group "."
 		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
 	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     headers))
 
-(defun shimbun-nikkei-get-headers-it-zensen (group folder)
-  "Function used to fetch headers for the it.zensen group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. url
-			"\\(\\./zensen\\.cfm"
-			"\\(\\?i="
-			;; 3. serial number
-			"\\("
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. month
-			"\\([01][0-9]\\)"
-			;; 6. day
-			"\\([0-3][0-9]\\)"
-			;; 7. serial
-			"\\([0-9a-z]+\\)\\)\\)\\)"
-			;;"\"\\)"
-			"\"" s0 ">" s0 "\\(([01]?[0-9]/[0-3]?[0-9])\\)?" s0
-			;; 9. subject
-			"\\([^<]+\\)" "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 9)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5))
-	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url
-	      (concat "http://it.nikkei.co.jp/it/column/zensen.cfm"
-		      (match-string 2)) folder))
-	    headers))
-    headers))
-
-(defun shimbun-nikkei-get-headers-it-manage (group folder)
-  "Function used to fetch headers for the it.manage group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. url
-			"\\(\\./foc\\.cfm"
-			"\\(\\?i="
-			;; 3. serial number
-			"\\("
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. month
-			"\\([01][0-9]\\)"
-			;; 6. day
-			"\\([0-3][0-9]\\)"
-			;; 7. serial
-			"\\([0-9a-z]+\\)\\)\\)\\)"
-			;;"\"\\)"
-			"\"" s0 ">" s0
-			;; 8. subject
-			"\\([^<]+\\)" "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 8)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5))
-	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url
-	      (concat "http://it.nikkei.co.jp/it/manage/foc.cfm"
-		      (match-string 2)) folder))
-	    headers))
+(defun shimbun-nikkei-get-headers-it-default (group folder shimbun range)
+  "Function used to fetch headers for the it groups."
+  (let ((pages (shimbun-header-index-pages range))
+	(count 0)
+	sub-end id headers)
+    (catch 'stop
+      (while t
+	(while (re-search-forward
+		(eval-when-compile
+		  (let ((s0 "[\t\n ]*")
+			(s1 "[\t\n ]+"))
+		    (concat "<a" s1 "href=\"/?"
+			    ;; 1. url
+			    "\\([^\"]+="
+			    ;; 2. serial number
+			    "\\([^\"/]+"
+			    ;; 3. day
+			    "\\([0-3][0-9]\\)"
+			    ;; 4. month
+			    "\\([01][0-9]\\)"
+			    ;; 5. year
+			    "\\(20[0-9][0-9]\\)"
+			    "\\)\\(?:&Page="
+			    ;; 6. serial number
+			    "\\([0-9]+\\)"
+			    "\\)?\\)"
+			    s0 "\"" s0 ">"
+			    "\\(?:" s0 "([01]?[0-9]/[0-3]?[0-9])\\)?" s0
+			    ;; 7. subject
+			    "\\([^<]+\\)"
+			    s0 "</a>")))
+		nil t)
+	  (setq sub-end (point)
+		id (concat "<" (shimbun-subst-char-in-string
+				?  ?_ (downcase (match-string 2)))
+			   "%" group "."
+			   shimbun-nikkei-top-level-domain ">"))
+	  (if (shimbun-search-id shimbun id)
+	      (unless (zerop count)
+		(throw 'stop nil))
+	    (push (shimbun-create-header
+		   0
+		   (match-string 7)
+		   shimbun-nikkei-from-address
+		   (shimbun-nikkei-make-date-string
+		    (string-to-number (match-string 5))
+		    (string-to-number (match-string 4))
+		    (string-to-number (match-string 3)))
+		   id "" 0 0
+		   (shimbun-nikkei-expand-url (match-string 1) folder))
+		  headers))
+	  (goto-char sub-end))
+	(if (and (or (not pages)
+		     (< (setq count (1+ count)) pages))
+		 (re-search-forward "\
+<a href=\"\\([^\"]+\\)\">&gt;&gt; 過去記事一覧</a>\
+\\|<a href=\"\\([^\"]+\\)\">次へ&gt;</a>"
+				    nil t))
+	    (progn
+	      (shimbun-retrieve-url (prog1
+					(concat "\
+http://it.nikkei.co.jp/" (or (match-string 1) (match-string 2)))
+				      (erase-buffer))
+				    t)
+	      (goto-char (point-min)))
+	  (throw 'stop nil))))
     headers))
 
-(defun shimbun-nikkei-get-headers-it-seisaku (group folder)
-  "Function used to fetch headers for the it.seisaku group."
+(defun shimbun-nikkei-get-headers-it-pc (group folder shimbun range)
+  "Function used to fetch headers for the it.pc group."
   (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. url
-			"\\(\\./seisaku\\.cfm"
-			"\\(\\?i="
-			;; 3. serial number
-			"\\("
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. month
-			"\\([01][0-9]\\)"
-			;; 6. day
-			"\\([0-3][0-9]\\)"
-			;; 7. serial
-			"\\([0-9a-z]+\\)\\)\\)\\)"
-			;;"\"\\)"
-			"\"" s0 ">" s0
-			;; 8. subject
-			"\\([^<]+\\)" "</a>")))
-	    nil t)
+    (while (and (re-search-forward
+		 (eval-when-compile
+		   (let ((s0 "[\t\n ]*")
+			 (s1 "[\t\n ]+"))
+		     (concat "<a" s1 "href=\"/"
+			     ;; 1. url
+			     "\\(pc/news/index\\.aspx\\?n="
+			     ;; 2. serial number
+			     "\\([^\"]+"
+			     ;; 3. day
+			     "\\([0-3][0-9]\\)"
+			     ;; 4. month
+			     "\\([01][0-9]\\)"
+			     ;; 5. year
+			     "\\(20[0-9][0-9]\\)"
+			     "\\)\\)" s0 "\"" s0 ">" s0
+			     ;; 6. subject
+			     "\\([^<]+\\)"
+			     s0 "</a>")))
+		 nil t)
+		(not (string-match "\\`[\t\n 　]*\\'" (match-string 6))))
       (push (shimbun-create-header
 	     0
-	     (match-string 8)
+	     (match-string 6)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
 	      (string-to-number (match-string 5))
-	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
-	    headers))
-    headers))
-
-(defun shimbun-nikkei-get-headers-it-digicore (group folder)
-  "Function used to fetch headers for the it.digicore group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. url
-			"\\(./digicore\\.cfm"
-			"\\(\\?i="
-			;; 3. serial number
-			"\\("
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. month
-			"\\([01][0-9]\\)"
-			;; 6. day
-			"\\([0-3][0-9]\\)"
-			;; 7. serial
-			"\\([0-9a-z]+\\)\\)\\)\\)"
-			;;"\"\\)"
-			"\"" s0 ">" s0 "\\(([01]?[0-9]/[0-3]?[0-9])\\)?" s0
-			;; 9. subject
-			"\\([^<]+\\)" "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 9)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5))
-	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 3) "%" group "."
-		     shimbun-nikkei-top-level-domain ">")
+	      (string-to-number (match-string 3)))
+	     (concat "<" (shimbun-subst-char-in-string
+			  ?  ?_ (downcase (match-string 2)))
+		     "%" group "." shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
 	     (shimbun-nikkei-expand-url
-	      (concat "http://it.nikkei.co.jp/it/column/digicore.cfm"
-		      (match-string 2)) folder))
+	      (concat "http://it.nikkei.co.jp/" (match-string 1))
+	      folder))
 	    headers))
     headers))
 
-(defun shimbun-nikkei-get-headers-markets (group folder)
-  "Function used to fetch headers for the markets group."
+(defun shimbun-nikkei-get-headers-stock (group folder shimbun range)
+  "Function used to fetch headers for stock groups."
   (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(summary\\.cfm"
-			;; 2. url
-			"\\(\\?genre="
-			;; 3. serial number
-			"\\([^\"]+date=\\)"
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
-			"\"" s0 ">" s0
-			;; 6. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 7. month
-			"\\([01]?[0-9]\\)"
-			"/"
-			;; 8. day
-			"\\([0-3]?[0-9]\\)"
-			s1
-			;; 9. hour
-			"\\([0-2]?[0-9]\\)"
-			":"
-			;; 10. minute
-			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 6)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 7))
-	      (string-to-number (match-string 8))
-	      (format "%02d:%02d"
-		      (string-to-number (match-string 9))
-		      (string-to-number (match-string 10))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
-	    headers))
-    (shimbun-sort-headers headers)))
-
-(defun shimbun-nikkei-get-headers-kawase (group folder)
-  "Function used to fetch headers for the kawase group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(summary\\.cfm"
-			;; 2. url
-			"\\(\\?id="
-			;; 3. serial number
-			"\\([^\"]+date=\\)"
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
-			"\"" s0 ">" s0
-			;; 6. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 7. month
-			"\\([01]?[0-9]\\)"
-			"/"
-			;; 8. day
-			"\\([0-3]?[0-9]\\)"
-			s1
-			;; 9. hour
-			"\\([0-2]?[0-9]\\)"
-			":"
-			;; 10. minute
-			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 6)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 7))
-	      (string-to-number (match-string 8))
-	      (format "%02d:%02d"
-		      (string-to-number (match-string 9))
-		      (string-to-number (match-string 10))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
-	    headers))
-    (shimbun-sort-headers headers)))
-
-(defun shimbun-nikkei-get-headers-bunkatsu2 (group folder)
-  "Function used to fetch headers for the kawase group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(bunkatsu3\\.cfm\\?genre=m4"
-			;; 2. url
-			"\\(&id="
-			;; 3. serial number
-			"\\([^\"]+date=\\)"
-			;; 4. year
-			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]"
-			;; 6. serial number
-			"\\([^\"]+\\)\\)\\)\\)"
-			"\"" s0 ">" s0
-			;; 7. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 8. month
-			"\\([01]?[0-9]\\)"
-			"/"
-			;; 9. day
-			"\\([0-3]?[0-9]\\)"
-			s1
-			;; 10. hour
-			"\\([0-2]?[0-9]\\)"
-			":"
-			;; 11. minute
-			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
-	    nil t)
-      (push (shimbun-create-header
-	     0
-	     (match-string 7)
-	     shimbun-nikkei-from-address
-	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 8))
-	      (string-to-number (match-string 9))
-	      (format "%02d:%02d"
-		      (string-to-number (match-string 10))
-		      (string-to-number (match-string 11))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
-	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
-	    headers))
-    (shimbun-sort-headers headers)))
-
-(defun shimbun-nikkei-get-headers-kinri (group folder)
-  "Function used to fetch headers for the kinri group."
-  (let (headers)
-    (while (re-search-forward
-	    (eval-when-compile
-	      (let ((s0 "[\t\n ]*")
-		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(kinri\\.cfm"
-			;; 2. url
-			"\\(\\?id="
+		(concat "<a" s1 "\
+href=\"http://markets\\.nikkei\\.co\\.jp/[a-z]+/[a-z0-9]+\\.aspx"
+			;; 1. url
+			"\\(\\?site=MARKET&genre="
+			;; 2. serial number
+			"\\([0-9a-z]+\\)" "&id="
 			;; 3. serial number
-			"\\([^\"]+date=\\)"
+			"\\([\t\n 0-9a-z]+[0-3][0-9][01][0-9]"
 			;; 4. year
 			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
+			"\\)"
+			"\\)"
 			"\"" s0 ">" s0
-			;; 6. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 7. month
+			;; 5. subject
+			"\\([^<]+\\)"
+			"</a>" "\\(?:\n\\)?" "\\(?:\n\\)?" "[\t\n ]+("
+			;; 6. month
 			"\\([01]?[0-9]\\)"
 			"/"
-			;; 8. day
+			;; 7. day
 			"\\([0-3]?[0-9]\\)"
 			s1
-			;; 9. hour
+			;; 8. hour
 			"\\([0-2]?[0-9]\\)"
 			":"
-			;; 10. minute
+			;; 9. minute
 			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
+			")" s0 "\\(?:[\t\n ]+\\)?" "</li>")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (match-string 5)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 4))
+	      (string-to-number (match-string 6))
 	      (string-to-number (match-string 7))
-	      (string-to-number (match-string 8))
 	      (format "%02d:%02d"
-		      (string-to-number (match-string 9))
-		      (string-to-number (match-string 10))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
+		      (string-to-number (match-string 8))
+		      (string-to-number (match-string 9))))
+	     (concat "<" (downcase (match-string 2)) "."
+		     (downcase (save-match-data
+				 (shimbun-replace-in-string (match-string 3)
+							    "[\t\n ]+" ".")))
+		     "%" group "."
+		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
+	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     (shimbun-sort-headers headers)))
 
-(defun shimbun-nikkei-get-headers-ft (group folder)
+(defun shimbun-nikkei-get-headers-ft (group folder shimbun range)
   "Function used to fetch headers for the ft group."
   (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(ft\\.cfm"
-			;; 2. url
-			"\\(\\?id="
-			;; 3. serial number
-			"\\([^\"]+date=\\)"
-			;; 4. year
+		(concat "<a" s1 "href=\"\
+http://markets\\.nikkei\\.co\\.jp/kaigai/ft\\.aspx"
+			;; 1. url
+			"\\(\\?site=MARKET&genre=ff&id="
+			;; 2. serial number
+			"\\([\t\n 0-9a-z]+[0-3][0-9][01][0-9]"
+			;; 3. year
 			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
+			"\\)"
+			"\\)"
 			"\"" s0 ">" s0
-			;; 6. subject
+			;; 4. subject
 			"\\([^<]+\\)"
-			s0 "\\([(|（]\\)"
-			;; 8. month
+			s0 "[(（]"
+			;; 5. month
 			"\\([01]?[0-9]\\)"
 			"/"
-			;; 9. day
+			;; 6. day
 			"\\([0-3]?[0-9]\\)"
-			"\\([）|)]\\)" s0 "※" s0 "</a>")))
+			"[)）]")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (match-string 4)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 8))
-	      (string-to-number (match-string 9)))
-;;	      (match-string 9))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
+	      (string-to-number (match-string 3))
+	      (string-to-number (match-string 5))
+	      (string-to-number (match-string 6))
+	      nil nil 1)
+	     (concat "<ff."
+		     (downcase (save-match-data
+				 (shimbun-replace-in-string (match-string 2)
+							    "[\t\n ]+" ".")))
+		     "%" group "."
+		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
+	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     headers))
 
-(defun shimbun-nikkei-get-headers-dj (group folder)
+(defun shimbun-nikkei-get-headers-dj (group folder shimbun range)
   "Function used to fetch headers for the dj group."
   (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(dj\\.cfm"
-			;; 2. url
-			"\\(\\?id="
-			;; 3. serial number
-			"\\([^\"]+date=\\)"
-			;; 4. year
+		(concat "<a" s1 "href=\"\
+http://markets\\.nikkei\\.co.jp/kaigai/dj\\.aspx"
+			;; 1. url
+			"\\(\\?site=MARKET&genre=dj&id="
+			;; 2. serial number
+			"\\([0-9a-z]+"
+			"[0-3][0-9][01][0-9]"
+			;; 3. year
 			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
-			"\"" s0 ">" s0
-			;; 6. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 7. month
+			"\\)"
+			"\\)"
+			"\"" s0 ">\\(?:<DJ>\\)?" s0
+			;; 4. subject
+			"\\([^<]+\\)"
+			s0 "[(（]"
+			;; 5. month
 			"\\([01]?[0-9]\\)"
 			"/"
-			;; 8. day
+			;; 6. day
 			"\\([0-3]?[0-9]\\)"
-			s1
-			;; 9. hour
-			"\\([0-2]?[0-9]\\)"
-			":"
-			;; 10. minute
-			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
+			"[)）]" s0 "</a>")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (match-string 4)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 7))
-	      (string-to-number (match-string 8))
-	      (format "%02d:%02d"
-		      (string-to-number (match-string 9))
-		      (string-to-number (match-string 10))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
+	      (string-to-number (match-string 3))
+	      (string-to-number (match-string 5))
+	      (string-to-number (match-string 6)))
+	     (concat "<dj." (downcase (match-string 2)) "%" group "."
+		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
+	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     (shimbun-sort-headers headers)))
 
-(defun shimbun-nikkei-get-headers-gyoseki (group folder)
-  "Function used to fetch headers for the gyoseki group."
+(defun shimbun-nikkei-get-headers-gyosuuchi (group folder shimbun range)
+  "Function used to fetch headers for the gyosuuchi group."
   (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
-			;; 1. base
-			"\\(gyoseki\\.cfm"
-			;; 2. url
-			"\\(\\?id="
+		(concat "<a" s1 "\
+href=\"http://markets\\.nikkei\\.co\\.jp/[a-z]+/[a-z0-9]+\\.aspx"
+			;; 1. url
+			"\\(\\?site=MARKET&genre="
+			;; 2. serial number
+			"\\([0-9a-z]+\\)" "&id="
 			;; 3. serial number
-			"\\([^\"]+date=\\)"
+			"\\([\t\n 0-9a-z]+[0-3][0-9][01][0-9]"
 			;; 4. year
 			"\\(20[0-9][0-9]\\)"
-			;; 5. serial number
-			"\\([01][0-9][0-3][0-9]\\)\\)\\)"
+			"\\)"
+			"\\)"
 			"\"" s0 ">" s0
-			;; 6. subject
-			"\\([^<]+\\)" s0 "（"
-			;; 7. month
+			;; 5. subject
+			"\\([^<]+\\)"
+			"</a>" "\\(?:\n\\)?" "\\(?:\n\\)?" "[\t\n ]+("
+			;; 6. month
 			"\\([01]?[0-9]\\)"
 			"/"
-			;; 8. day
+			;; 7. day
 			"\\([0-3]?[0-9]\\)"
 			s1
-			;; 9. hour
+			;; 8. hour
 			"\\([0-2]?[0-9]\\)"
 			":"
-			;; 10. minute
+			;; 9. minute
 			"\\([0-5]?[0-9]\\)"
-			"）" s0 "</a>")))
+			")" s0 "\\(?:[\t\n ]+\\)?" "</li>")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (match-string 5)
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 4))
+	      (string-to-number (match-string 6))
 	      (string-to-number (match-string 7))
-	      (string-to-number (match-string 8))
 	      (format "%02d:%02d"
-		      (string-to-number (match-string 9))
-		      (string-to-number (match-string 10))))
-	     (concat "<" (match-string 3) (match-string 4) (match-string 5)
-		     "%" group "." shimbun-nikkei-top-level-domain ">")
+		      (string-to-number (match-string 8))
+		      (string-to-number (match-string 9))))
+	     (concat "<" (downcase (match-string 2)) "."
+		     (downcase (save-match-data
+				 (shimbun-replace-in-string (match-string 3)
+							    "[\t\n ]+" ".")))
+		     "%" group "."
+		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 2) folder))
+	     (shimbun-nikkei-expand-url
+	      (concat "\
+http://markets.nikkei.co.jp/kokunai/bunkatsu3.aspx" (match-string 1)) folder))
 	    headers))
     (shimbun-sort-headers headers)))
 
-(defun shimbun-nikkei-get-headers-market (group folder)
+(defun shimbun-nikkei-get-headers-market (group folder shimbun range)
   "Function used to fetch headers for the market group."
   (let ((subregexp
 	 (eval-when-compile
@@ -1081,8 +1058,8 @@
 		     "月"
 		     ;; 3. day
 		     "\\([0-3]?[0-9]\\)"
-		     "日\\(" s1
-		     ;; 5. hour:minute
+		     "日\\(?:" s1
+		     ;; 4. hour:minute
 		     "\\([012]?[0-9]:[0-5]?[0-9]\\)"
 		     "\\)?"))))
 	subdata start end subtitle month day time from year headers)
@@ -1102,7 +1079,7 @@
 	(setq subtitle (match-string 1)
 	      month (string-to-number (match-string 2))
 	      day (string-to-number (match-string 3))
-	      time (match-string 5))
+	      time (match-string 4))
 	(setq from (shimbun-replace-in-string
 		    shimbun-nikkei-from-address
 		    ")" (concat "/"
@@ -1120,124 +1097,201 @@
 			    "\\("
 			    ;; 3. year
 			    "\\(20[0-9][0-9]\\)"
-			    "\\([^.]+\\)"
+			    "[^.]+"
 			    "\\)"
-			    "\\.html\\)\""
-			    s0 ">\\(" s0 "<[^>]+>\\)*" s0
-			    ;; 6. subject
-
+			    "\\.html\\)"
+			    s0 "\"" s0 ">\\(?:" s0 "<[^>]+>\\)*" s0
+			    ;; 4. subject
 			    "\\([^<]+\\)"
 			    s0)))
 		end t)
 	  (setq year (string-to-number (match-string 3)))
 	  (push (shimbun-create-header
 		 0
-		 (match-string 6)
+		 (match-string 4)
 		 from
 		 (shimbun-nikkei-make-date-string year month day time)
 		 (format "<%s%%%s.%s>"
-			 (match-string 2) group
+			 (downcase (match-string 2)) group
 			 shimbun-nikkei-top-level-domain)
 		 "" 0 0
 		 (shimbun-nikkei-expand-url (match-string 1)
 					    shimbun-nikkei-url))
 		headers))
 	(setq start end))
-      (shimbun-sort-headers headers))))
+      headers)))
 
-(defun shimbun-nikkei-get-headers-retto (group folder)
-  "Function used to fetch headers for the retto group."
-  (let ((region "")
-	headers)
+(defun shimbun-nikkei-get-headers-china (group folder shimbun range)
+  "Function used to fetch headers for the china group."
+  (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<p[^>]*>" s0 "【"
-			;; 1. region
-			"\\([^\t\n ]+\\)"
-			"】" s0 "</p>"
-			"\\|"
-			"<AREA21" s1 "HEADLINE=\""
-			;; 2. subject
-			"\\([^\"]+\\)"
-			"\"" s1 "URL=\""
-			;; 3. url
+		(concat "<a" s1 "href=\""
+			;; 1. url
+			"\\("
+			;; 2. serial number
 			"\\("
-			;; 4. serial number
-			"\\(20[0-9][0-9][01][0-9][0-9a-z]+\\)"
+			;; 3. year
+			"\\(20[0-9][0-9]\\)"
+			;; 4. month
+			"\\([01][0-9]\\)"
+			;; 5. day
+			"\\([0-3][0-9]\\)"
+			"[0-9_a-z]+"
+			"\\)"
 			"\\.html\\)"
-			"\"" s1 "ARTICLE_TIME=\""
-			;; 5. year
-			"\\(20[0-9][0-9]\\)" "/"
-			;; 6. month
-			"\\([01][0-9]\\)" "/"
-			;; 7. day
-			"\\([0-3][0-9]\\)" s1
-			;; 8. hour:minute
-			"\\([012][0-9]:[0-5][0-9]\\)")))
+			s0 "\"" s0 ">"
+			s0 "\\(?:([01]?[0-9]/[0-3]?[0-9])\\)?" s0
+			;; 7. subject
+			"\\([^<]+\\)"
+			"</a>")))
 	    nil t)
-      (if (match-beginning 1)
-	  (setq region (match-string 1))
-	(push (shimbun-create-header
-	       0
-	       (concat "[" region "] " (match-string 2))
-	       shimbun-nikkei-from-address
-	       (shimbun-nikkei-make-date-string
-		(string-to-number (match-string 5))
-		(string-to-number (match-string 6))
-		(string-to-number (match-string 7))
-		(match-string 8))
-	       (concat "<" (match-string 4) "%" group "."
-		       shimbun-nikkei-top-level-domain ">")
-	       "" 0 0
-	       (shimbun-nikkei-expand-url (match-string 3) folder))
-	      headers)))
-    (shimbun-sort-headers headers)))
+      (push (shimbun-create-header
+	     0
+	     (match-string 6)
+	     shimbun-nikkei-from-address
+	     (shimbun-nikkei-make-date-string
+	      (string-to-number (match-string 3))
+	      (string-to-number (match-string 4))
+	      (string-to-number (match-string 5)))
+	     (concat "<" (downcase (match-string 2)) "%" group "."
+		     shimbun-nikkei-top-level-domain ">")
+	     "" 0 0
+	     (shimbun-nikkei-expand-url (match-string 1) folder))
+	    headers))
+    headers))
+
+(defun shimbun-nikkei-get-headers-retto (group folder shimbun range)
+  "Function used to fetch headers for the retto group."
+  (when (re-search-forward "\
+<h[0-9][\t\n ]+class=\"retto-ctgy[^>]+>\\([^\t\n ]+\\)</h[0-9]>"
+			   nil t)
+    (let ((start (match-end 0))
+	  (region (match-string 1))
+	  end next subject url serial year month day time headers)
+      (while start
+	(if (re-search-forward "\
+<h[0-9][\t\n ]+class=\"retto-ctgy[^>]+>\\([^\t\n ]+\\)</h[0-9]>"
+			       nil t)
+	    (setq end (match-end 0)
+		  next (match-string 1))
+	  (setq end nil))
+	(while (progn
+		 (goto-char start)
+		 (re-search-forward
+		  (eval-when-compile
+		    (let ((s0 "[\t\n ]*")
+			  (s1 "[\t\n ]+"))
+		      (concat "<AREA21" s1 "HEADLINE=\""
+			      ;; 1. subject
+			      "\\([^\"]+\\)"
+			      "\"" s1 "URL=\""
+			      ;; 2. url
+			      "\\("
+			      ;; 3. serial number
+			      "\\([^\".]+\\)"
+			      "\\.html\\)"
+			      s0 "\"" s1 "ARTICLE_TIME=\""
+			      ;; 4. year
+			      "\\(20[0-9][0-9]\\)"
+			      "/"
+			      ;; 5. month
+			      "\\([01][0-9]\\)"
+			      "/"
+			      ;; 6. day
+			      "\\([0-3][0-9]\\)"
+			      s1
+			      ;; 7. hour:minute
+			      "\\([012][0-9]:[0-5][0-9]\\)")))
+		  end t))
+	  (setq subject (match-string 1)
+		url (match-string 2)
+		serial (downcase (match-string 3))
+		year (string-to-number (match-string 4))
+		month (string-to-number (match-string 5))
+		day (string-to-number (match-string 6))
+		time (match-string 7)
+		start (match-end 0))
+	  (when (re-search-forward
+		 (concat
+		  (eval-when-compile
+		    (let ((s0 "[\t\n ]*")
+			  (s1 "[\t\n ]+"))
+		      (concat "<!--" s1 "aLink" s1 "-->" s0 "<a" s1 "HREF=\""
+			      ;; 1. url
+			      "\\([^\"]+\\)"
+			      s0 "\">" s0 "<!--" s1 "headline" s1 "-->" s0)))
+		  (regexp-quote subject))
+		 end t)
+	    (setq url (match-string 1)))
+	  (push (shimbun-create-header
+		 0
+		 (concat "[" region "] " subject)
+		 shimbun-nikkei-from-address
+		 (shimbun-nikkei-make-date-string year month day time)
+		 (concat "<" serial "%" group "."
+			 shimbun-nikkei-top-level-domain ">")
+		 "" 0 0
+		 (shimbun-nikkei-expand-url url folder))
+		headers))
+	(setq start end
+	      region next))
+      headers)))
 
-(defun shimbun-nikkei-get-headers-sports (group folder)
+(defun shimbun-nikkei-get-headers-sports (group folder shimbun range)
   "Function used to fetch headers for the sports group."
-  (let (headers)
+  ;; Skip headlinenews.
+  (re-search-forward "\
+<span[\t\n ]+class=\"sub_bar_time\">[\t\n ]*更新：[01]?[0-9]月[0-3]?[0-9]日"
+		     nil t)
+  (let (category headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
 		(concat "<a" s1 "href=\""
 			;; 1. url
-			"\\(\\./news\\.cfm\\?i="
+			"\\(http://sports\\.nikkei\\.co\\.jp/news\\.cfm\\?i="
 			;; 2. serial number
 			"\\("
 			;; 3. year
 			"\\(20[0-9][0-9]\\)"
-			"[01][0-9][0-3][0-9][^\"]+\\)\\)"
-			"\"[^>]+>" "\\(" s0 "<[^>]+>\\)*" s0 "(" s0
+			"[^&]+\\)"
+			"&t="
+			;; 4. category
+			"\\([^\"]+\\)"
+			"\\)"
+			s0 "\">" s0 "("
 			;; 5. month
-			"\\([0-9]+\\)"
-			s0 "/" s0
+			"\\([01]?[0-9]\\)"
+			"/"
 			;; 6. day
-			"\\([0-9]+\\)"
-			s0 ")" s0
+			"\\([0-3]?[0-9]\\)"
+			")" s0
 			;; 7. subject
 			"\\([^<]+\\)")))
 	    nil t)
+      (setq category (match-string 4))
       (push (shimbun-create-header
 	     0
-	     (match-string 7)
+	     (concat "[" category "] " (match-string 7))
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 3))
 	      (string-to-number (match-string 5))
 	      (string-to-number (match-string 6)))
-	     (concat "<" (match-string 2) "%" group "."
+	     (concat "<" (downcase (match-string 2)) "%" category "." group "."
 		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
-	     (shimbun-nikkei-expand-url (match-string 1) folder))
+	     (match-string 1))
 	    headers))
     headers))
 
-(defun shimbun-nikkei-get-headers-newpro (group folder)
+(defun shimbun-nikkei-get-headers-newpro (group folder shimbun range)
   "Function used to fetch headers for the newpro group."
-  (when (re-search-forward ">[\t\n ]*● 新製品記事一覧[\t\n ]*<" nil t)
+  (when (re-search-forward ">[\t\n ]*最新新製品ニュース[\t\n ]*<" nil t)
     (narrow-to-region (point) (or (search-forward "</ul>" nil t)
 				  (point-max)))
     (goto-char (point-min))
@@ -1248,30 +1302,30 @@
 		      (s1 "[\t\n ]+"))
 		  (concat "<a" s1 "href=\""
 			  ;; 1. url
-			  "\\(\\([^\"]+/\\)?"
-			  ;; 3. serial number
+			  "\\(\\(?:[^\"]+/\\)?"
+			  ;; 2. serial number
 			  "\\("
-			  ;; 4. year
+			  ;; 3. year
 			  "\\(20[0-9][0-9]\\)"
-			  ;; 5. month
+			  ;; 4. month
 			  "\\([01][0-9]\\)"
-			  ;; 6. day
+			  ;; 5. day
 			  "\\([0-3][0-9]\\)"
 			  "[0-9a-z]+\\)"
 			  "\\.html\\)"
-			  "\"" s0 ">" s0
-			  ;; 7. subject
+			  s0 "\"" s0 ">" s0
+			  ;; 6. subject
 			  "\\([^<]+\\)")))
 	      nil t)
 	(push (shimbun-create-header
 	       0
-	       (match-string 7)
+	       (match-string 6)
 	       shimbun-nikkei-from-address
 	       (shimbun-nikkei-make-date-string
+		(string-to-number (match-string 3))
 		(string-to-number (match-string 4))
-		(string-to-number (match-string 5))
-		(string-to-number (match-string 6)))
-	       (concat "<" (match-string 3) "%" group "."
+		(string-to-number (match-string 5)))
+	       (concat "<" (downcase (match-string 2)) "%" group "."
 		       shimbun-nikkei-top-level-domain ">")
 	       "" 0 0
 	       (shimbun-nikkei-expand-url (match-string 1) folder))
@@ -1279,7 +1333,7 @@
       (widen)
       headers)))
 
-(defun shimbun-nikkei-get-headers-release (group folder)
+(defun shimbun-nikkei-get-headers-release (group folder shimbun range)
   "Function used to fetch headers for the release group."
   (let (url id subject sub-end year month day headers)
     (while (re-search-forward
@@ -1291,12 +1345,13 @@
 			"\\(detail\\.cfm\\?relID="
 			;; 2. serial number
 			"\\([^\"]+\\)"
-			"\\)\"" s0 ">" s0
+			"\\)"
+			s0 "\"" s0 ">" s0
 			;; 3. subject
 			"\\([^<]+\\)")))
 	    nil t)
       (setq url (match-string 1)
-	    id (match-string 2)
+	    id (downcase (match-string 2))
 	    subject (match-string 3)
 	    sub-end (point))
       (when (re-search-backward "\
@@ -1318,98 +1373,180 @@
 	(goto-char sub-end)))
     headers))
 
-(defun shimbun-nikkei-get-headers-shasetsu (group folder)
+(defun shimbun-nikkei-get-headers-release2 (group folder shimbun range)
+  "Function used to fetch headers for the release-in-detail groups."
+  (let ((pages (shimbun-header-index-pages range))
+	(count 0)
+	url id subject sub-end year month day headers)
+    (catch 'stop
+      (while t
+	(while (re-search-forward
+		(eval-when-compile
+		  (let ((s0 "[\t\n ]*")
+			(s1 "[\t\n ]+"))
+		    (concat "<a" s1 "href=\""
+			    ;; 1. url
+			    "\\(detail\\.cfm\\?relID="
+			    ;; 2. serial number
+			    "\\([^\"]+\\)"
+			    "\\)"
+			    s0 "\"" s0 ">" s0
+			    ;; 3. subject
+			    "\\([^<]+\\)")))
+		nil t)
+	  (setq url (match-string 1)
+		id (downcase (match-string 2))
+		subject (match-string 3)
+		sub-end (point))
+	  (when (re-search-backward "\
+>[\t\n ]*\\(20[0-9][0-9]\\)/\\([01][0-9]\\)/\\([0-3][0-9]\\)[^0-9]"
+				    nil t)
+	    (setq year (string-to-number (match-string 1))
+		  month (string-to-number (match-string 2))
+		  day (string-to-number (match-string 3))
+		  id (format "<%d%02d%02d.%s%%%s.%s>"
+			     year month day id group
+			     shimbun-nikkei-top-level-domain))
+	    (if (shimbun-search-id shimbun id)
+		(unless (zerop count)
+		  (throw 'stop nil))
+	      (push (shimbun-create-header
+		     0 subject shimbun-nikkei-from-address
+		     (shimbun-nikkei-make-date-string year month day)
+		     id "" 0 0
+		     (shimbun-nikkei-expand-url
+		      (concat "http://release.nikkei.co.jp/" url) folder))
+		    headers))
+	    (goto-char sub-end)))
+	(if (and (or (not pages)
+		     (< (setq count (1+ count)) pages))
+		 (progn
+		   (goto-char (point-min))
+		   (re-search-forward "<a[\t\n ]+href=\"\
+\\(isclassList\\.cfm\\?page=[0-9]+&lindID=[0-9]+&sindID=[0-9]+\\)\
+\[\t\n ]*\"[\t\n ]*>[\t\n ]*次へ[\t\n ]*&gt;[\t\n ]*</a>"
+				      nil t)))
+	    (progn
+	      (shimbun-retrieve-url (prog1
+					(concat "http://release.nikkei.co.jp/"
+						(match-string 1))
+				      (erase-buffer))
+				    t)
+	      (goto-char (point-min)))
+	  (throw 'stop nil))))
+    headers))
+
+(defun shimbun-nikkei-get-headers-shasetsu (group folder shimbun range)
   "Function used to fetch headers for the shasetsu group."
+  (goto-char (point-max))
+  (insert (with-temp-buffer
+	    (shimbun-retrieve-url
+	     "http://www.nikkei.co.jp/news/shasetsu/IndexKijiIchiran.js"
+	     t)
+	    (buffer-string)))
+  (goto-char (point-min))
   (let (headers)
     (while (re-search-forward
 	    (eval-when-compile
 	      (let ((s0 "[\t\n ]*")
 		    (s1 "[\t\n ]+"))
-		(concat "<a" s1 "href=\""
+		(concat "<a" s1 "href=\\\\\""
 			;; 1. url
-			"\\([^\"]+/"
+			"\\(/\\(?:[^\"/\\]+/+\\)+"
 			;; 2. serial number
-			"\\("
+			"\\([^\"/\\]+"
 			;; 3. year
 			"\\(20[0-9][0-9]\\)"
-			;; 4. month
-			"\\([01][0-9]\\)"
-			;; 5. day
-			"\\([0-3][0-9]\\)"
-			"[^/]+\\)"
+			"\\)"
 			"\\.html\\)"
-			"\"" s0 ">" s0
-			;; 6. subject
-			"\\(\\(社説\\|春秋\\)[^<]+\\)")))
+			"\\\\\"[^>]*>" s0
+			;; 4. subject
+			"\\(\\(?:社説\\|春秋\\)[^<]*[(（]" s0
+			;; 5. month
+			"\\([01]?[0-9]\\)"
+			s0 "/" s0
+			;; 6. day
+			"\\([0-3]?[0-9]\\)"
+			s0 "[)）]\\)"
+			s0 "</a>")))
 	    nil t)
       (push (shimbun-create-header
 	     0
-	     (match-string 6)
+	     (shimbun-subst-char-in-string
+	      ?\） ?\)
+	      (shimbun-subst-char-in-string ?\（ ?\( (match-string 4)))
 	     shimbun-nikkei-from-address
 	     (shimbun-nikkei-make-date-string
 	      (string-to-number (match-string 3))
-	      (string-to-number (match-string 4))
-	      (string-to-number (match-string 5)))
-	     (concat "<" (match-string 2) "%" group "."
+	      (string-to-number (match-string 5))
+	      (string-to-number (match-string 6)))
+	     (concat "<" (downcase (match-string 2)) "%" group "."
 		     shimbun-nikkei-top-level-domain ">")
 	     "" 0 0
 	     (shimbun-nikkei-expand-url (match-string 1) folder))
 	    headers))
     (nreverse headers)))
 
-(defun shimbun-nikkei-get-headers-okuyami (group folder)
-  "Function used to fetch headers for the okuyami group."
-  (when (re-search-forward ">[\t\n ]*▼おくやみ[\t\n ]*<" nil t)
-    (let (headers)
-      (while (re-search-forward
-	      (eval-when-compile
-		(let ((s0 "[\t\n ]*")
-		      (s1 "[\t\n ]+"))
-		  (concat "<a" s1 "href=\""
-			  ;; 1. url
-			  "\\([^\"]+/"
-			  ;; 2. serial number
-			  "\\("
-			  ;; 3. year
-			  "\\(20[0-9][0-9]\\)"
-			  ;; 4. month
-			  "\\([01][0-9]\\)"
-			  ;; 5. day
-			  "\\([0-3][0-9]\\)"
-			  "[0-9a-z]+\\)"
-			  "\\.html\\)"
-			  "\"" s0 ">" s0
-			  ;; 6. subject
-			  "\\([^<]+\\)")))
-	      nil t)
-	(push (shimbun-create-header
-	       0
-	       (match-string 6)
-	       shimbun-nikkei-from-address
-	       (shimbun-nikkei-make-date-string
-		(string-to-number (match-string 3))
-		(string-to-number (match-string 4))
-		(string-to-number (match-string 5)))
-	       (concat "<" (match-string 2) "%" group "."
-		       shimbun-nikkei-top-level-domain ">")
-	       "" 0 0
-	       (shimbun-nikkei-expand-url (match-string 1) folder))
-	      headers))
-      headers)))
-
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-nikkei)
 						   header)
   (let ((fn (nth 4 (assoc (shimbun-current-group-internal shimbun)
 			  shimbun-nikkei-group-table)))
 	(case-fold-search t))
     (while (search-forward "\r" nil t)
-      (delete-backward-char 1))
+      (delete-char -1))
     (goto-char (point-min))
-    (when (fboundp fn)
-      (funcall fn header)
-      (goto-char (point-min)))))
+    (while (re-search-forward "[\t\n ]*\\(?:\
+<ul\\(?:[\t\n ]+[^>]+\\)?>\
+\\|</ul>\
+\\|<a[\t\n ]+[^>]+>[\t\n ]*＜拡大\\(?:画像\\)?＞[\t\n ]*</a>\
+\\|\\(?:<div[\t\n ]+[^>]+>[\t\n ]*\\)?<img[\t\n ]+src=\"[^\"]+/s\\.gif\"\
+\[^>]+>\\(?:[\t\n ]*</div>\\)?\
+\\)[\t\n ]*"
+			      nil t)
+      (delete-region (match-beginning 0) (match-end 0)))
+    (goto-char (point-min))
+    (if (and (fboundp fn)
+	     (funcall fn header))
+	(shimbun-with-narrowed-article
+	 shimbun
+	 ;; Remove <center> tags surrounding images.
+	 (while (and (search-forward "<center>" nil t)
+		     (progn
+		       (backward-char 1)
+		       (shimbun-end-of-tag "center" t))
+		     (save-match-data
+		       (re-search-backward "<img[\t\n ]+"
+					   (match-beginning 2) t)))
+	   (replace-match "\\3"))
+	 ;; Remove useless tags around images.
+	 (goto-char (point-min))
+	 (while (re-search-forward "[\t\n ]*\
+\\(?:<\\(?:\\(?:/?div\\|/?p\\|/?td\\|/?tr\\)\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)\
+\\|![^>]+\\)>[\t\n ]*\\)+\
+\\(<img[\t\n ]+[^>]+>\\)[\t\n ]*\
+\\(?:<\\(?:\\(?:/?div\\|/?p\\|/?td\\|/?tr\\)\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)\
+\\|![^>]+\\)>[\t\n ]*\\)+"
+				   nil t)
+	   (replace-match "\n\\1<br>\n"))
+	 ;; Remove trailing garbage.
+	 (goto-char (point-min))
+	 (when (re-search-forward "[\t\n ]*\
+\\(?:<\\(?:\\(?:/?div\\|/?p\\)\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)\\|![^>]+\\)>\
+\[\t\n ]*\\)+\\'"
+				  nil t)
+	   (replace-match "\n"))
+	 ;; Break long lines.
+	 (shimbun-break-long-japanese-lines))
+      (erase-buffer)
+      (insert "<html><body>\
+Couldn't extract the body for this article.<br>\
+Please visit <a href=\""
+	      (shimbun-header-xref header)
+	      "\"><u>the original page</u></a>.\
+</body></html>\n"))
+    (goto-char (point-min))))
 
-(defun shimbun-nikkei-prepare-article-default (&rest args)
+(defun shimbun-nikkei-prepare-article-default-0 (&rest args)
   "Default function used to prepare contents of an article."
   (let (photo-end body)
     (when (re-search-forward "<table[\t\n ]+id=\"photonews" nil t)
@@ -1417,19 +1554,22 @@
       (when (search-forward "</table>" nil t)
 	(setq photo-end (point))))
     (when (or (and (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]+-->[\t\n ]*"
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>[\t\n ]*"
 				      nil t)
-		   (setq body (point))
-		   (re-search-forward "\
-\[\t\n ]*<!--[\t\n ]*FJZONE[\t\n ]*END[\t\n ]*NAME=\"HONBUN\""
-				      nil t))
+		   (progn
+		     (setq body (point))
+		     (re-search-forward "\
+\\(?:[\t\n 　]*<\\(?:p\\|p[\t\n 　]+[^>]+\\|/p\\|/p[\t\n 　]+[^>]+\\)>\\)*\
+\[\t\n 　]*<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\""
+					nil t)))
 	      ;; The following section will be used for the `main' group.
 	      (and (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"MIDASHI\""
+<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"MIDASHI\""
 				      nil t)
 		   (search-forward "<p>" nil t)
-		   (setq body (match-beginning 0))
-		   (re-search-forward "<p[^>]\\|\n\n+" nil t)))
+		   (progn
+		     (setq body (match-beginning 0))
+		     (re-search-forward "<p[^>]\\|\n\n+" nil t))))
       (goto-char (match-beginning 0))
       (insert shimbun-nikkei-content-end)
       (if photo-end
@@ -1442,62 +1582,227 @@
 	      (replace-match "<img src=\"\\1\""))
 	    (goto-char (point-min)))
 	(goto-char body))
-      (insert shimbun-nikkei-content-start))))
+      (goto-char (point-min))
+      (if (and (re-search-forward "<table[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+\\(?:class=\"photo\\|summary=\"写真\\)"
+				  nil t)
+	       (shimbun-end-of-tag "table" t))
+	  (progn
+	    (delete-region (match-end 3) body)
+	    (insert "\n")
+	    (goto-char (match-beginning 3)))
+	(goto-char body))
+      (insert shimbun-nikkei-content-start)
+      t)))
 
-(defun shimbun-nikkei-prepare-article-default2 (&rest args)
-  "Function used to prepare contents of an article for some groups."
-  (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]+-->"
-			   nil t)
-    (insert shimbun-nikkei-content-start)
-    (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]*END[\t\n ]*NAME=\"HONBUN\"[\t\n ]+-->"
-			     nil t)
-      (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
+(defun shimbun-nikkei-prepare-article-default (header)
+  "Default function used to prepare contents of an article."
+  (let (start end)
+    (if (or
+	 (when (re-search-forward
+		"<!-+[\t\n ]*コンテンツ枠[\t\n ]*-+>[\t\n ]*"
+		nil t)
+	   (setq start (match-end 0))
+	   (or (re-search-forward "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+<!-+[\t\n ]*//コンテンツ枠[\t\n ]*-+>[\t\n ]*"
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (when (re-search-forward
+		"<!-+[\t\n ]*編成コンテンツ枠[\t\n ]*-+>[\t\n ]*"
+		nil t)
+	   (setq start (match-end 0))
+	   (or (re-search-forward "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+<!-+[\t\n ]*//編成コンテンツ枠[\t\n ]*-+>[\t\n ]*"
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (when (re-search-forward "<!--photo-->[\t\n ]*" nil t)
+	   (setq start (match-end 0))
+	   (or (re-search-forward "\
+\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\\[[01]?[0-9]月[0-3]?[0-9]日[/／][^]]+\\]"
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (when (re-search-forward "\
+\\(<!-+[\t\n ]*Photo[\t\n _]+news[\t\n ]*-+>[\t\n ]*\\)\
+\\|<\\([^\t\n >]+\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+\\(?:class=\"photo\"\\|summary=\"写真ニュース\"\\)[^>]*>[\t\n ]*\
+\\|<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME[\t\n ]*\
+=[\t\n ]*\"[\t\n ]*HONBUN[\t\n ]*\"[\t\n ]*-+>[\t\n ]*"
+				  nil t)
+	   (let (st nd)
+	     (if (and (or (and (match-beginning 1)
+			       (progn
+				 (setq st (match-end 1))
+				 (re-search-forward "\
+\[\t\n ]*<!-+[\t\n ]*/Photo[\t\n _]news[\t\n ]*-+>"
+						    nil t)
+				 (setq nd (match-beginning 0))))
+			  (and (match-beginning 2)
+			       (shimbun-end-of-tag (match-string 2) t)
+			       (setq st (match-beginning 3)
+				     nd (match-end 3))))
+		      (re-search-forward "\
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME[\t\n ]*=[\t\n ]*\"HONBUN\"[\t\n ]*\
+-+>[\t\n ]*"
+					 nil t))
+		 (progn
+		   (setq start st)
+		   (delete-region nd (match-end 0))
+		   (insert "\n"))
+	       (setq start (match-end 0))))
+	   (or (re-search-forward "\\(?:[\t\n ]*<[^/][^>]*>\\)*[\t\n ]*\
+<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME[\t\n ]*\
+=[\t\n ]*\"[\t\n ]*HONBUN[\t\n ]*\"[\t\n ]*-+>"
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (when (or (re-search-forward
+		    "<!-+[\t\n ]*特集記事大[\t\n ]*-+>[\t\n ]*"
+		    nil t)
+		   (re-search-forward "<!-+[\t\n ]*記事[\t\n ]*-+>[\t\n ]*"
+				      nil t))
+	   (setq start (match-end 0))
+	   (or (re-search-forward "\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+<!-+[\t\n ]*\\(?://記事\\|特集記事フッタ\\)[\t\n ]*-+>"
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (setq end (shimbun-nikkei-prepare-article-default-0 header))
+	 (prog1 nil (goto-char (point-min)))
+
+	 ;; Filters having a potential to mistakenly extract the body follow.
+	 (when (or (re-search-forward "\
+<a[\t\n ]+href=\"\\./\">[\t\n ]*トップ[\t\n ]*</a>[\t\n ]*"
+				      nil t)
+		   (re-search-forward "\
+<div[\t\n ]+class=\"title[^\"]*\">\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*"
+				      nil t)
+		   (re-search-forward "\
+<a[\t\n ]+href=\"\\./\">\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*</a>\
+\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*"
+				      nil t))
+	   (setq start (match-end 0))
+	   (or (re-search-forward "\
+\[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*<p\\(?:[\t\n ]+[^>]+\\)*[\t\n ]align="
+				  nil t)
+	       (prog1 nil (goto-char (point-min)))))
+	 (when (or (re-search-forward "\
+<!-+[\t\n ]*写真[\t\n ]*-+>\\(?:[\t\n ]*<[^i][^>]*>\\)*[\t\n ]*"
+				      nil t)
+		   (re-search-forward "<!-+[\t\n ]*本文[\t\n ]*-+>" nil t)
+		   (re-search-forward "<div[\t\n ]+class=[^>]+>[\t\n ]*"
+				      nil t))
+	   (setq start (match-end 0))
+	   (set-match-data nil)
+	   (while (re-search-forward "[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*\
+<!-+[\t\n ]*本文[\t\n ]*-+>"
+				     nil t))
+	   (or (match-beginning 0)
+	       (prog1 nil (goto-char (point-min))))))
+	(progn
+	  (unless end
+	    (goto-char (match-beginning 0))
+	    (insert shimbun-nikkei-content-end)
+	    (goto-char start)
+	    (insert shimbun-nikkei-content-start))
+	  t)
+      (when (and (re-search-forward "\
+<a[\t\n ]+[^>]+>[\t\n ]*＞＞記事を読む[\t\n ]*</a>"
+				    nil t)
+		 (re-search-backward "href=\"\\([^\"]+\\)"
+				     (match-beginning 0) t))
+	(let ((new (match-string 1))
+	      (old (shimbun-header-xref header)))
+	  (when (string-match "[^/]/[^/]" old)
+	    (setq new (shimbun-nikkei-expand-url
+		       new (substring old 0 (1- (match-end 0)))))
+	    (shimbun-header-set-xref header new)
+	    (erase-buffer)
+	    (shimbun-retrieve-url new t)
+	    (goto-char (point-min))
+	    (shimbun-nikkei-prepare-article-default header)))))))
 
-(defun shimbun-nikkei-prepare-article-kansai (&rest args)
+(defun shimbun-nikkei-prepare-article-default2 (&rest args)
   "Function used to prepare contents of an article for some groups."
+  ;; Remove unwanted images.
+  (let (start end)
+    (while (re-search-forward "[\t\n ]*<div[\t\n ]+[^>]+>[\t\n ]*<img[\t\n ]+\
+\[^>]+>[\t\n ]*</div>[\t\n ]*"
+			      nil t)
+      (setq start (match-beginning 0)
+	    end (match-end 0))
+      (goto-char start)
+      (if (re-search-forward
+	   "src=\"http://parts\\.nikkei\\.co\\.jp/parts/s\\.gif\""
+	   end t)
+	  (delete-region start end)
+	(goto-char end))))
+  (goto-char (point-min))
   (when (re-search-forward "\
-<td[\t\n ]+colspan=\"2\"[\t\n ]+class=\"textm\">"
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>"
 			   nil t)
     (insert shimbun-nikkei-content-start)
     (when (re-search-forward "\
-<table[\t\n ]+border=\"0\"[\t\n ]+cellspacing=\
-\"0\"[\t\n ]+cellpadding=\"0\"[\t\n ]+width=\"100%\">"
+\\(?:[\t\n 　]*<\\(?:p\\|p[\t\n 　]+[^>]+\\|/p\\|/p[\t\n 　]+[^>]+\\)>\\)*\
+\[\t\n 　]*<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>\
+\\|<a[\t\n ]+name=\"newslist\"></a>\n"
 			     nil t)
       (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
-
-(defun shimbun-nikkei-prepare-article-default3 (&rest args)
-  "Function used to prepare contents of an article for some groups."
-  (when (re-search-forward "\
-\[\t\n ]<div[\t\n ]+class=\"news\"[\t\n ]+id=\"report\">"
-			   nil t)
-    (insert shimbun-nikkei-content-start)
-    (when (re-search-forward "[\t\n ]<ul[\t\n ]+id=\"tool\">" nil t)
-      (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
+      (insert shimbun-nikkei-content-end)
+      t)))
 
-(defun shimbun-nikkei-prepare-article-bunkatsu2 (&rest args)
-  "Function used to prepare contents of an article for some groups."
-  (when (re-search-forward "[\t\n ]<div[\t\n ]+class=\"bg_gray\">" nil t)
-    (insert shimbun-nikkei-content-start)
-    (when (re-search-forward "[\t\n ]<div[\t\n ]+class=\"column\">" nil t)
-      (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
+(defun shimbun-nikkei-prepare-article-kansai (header)
+  "Function used to prepare contents of an article for the kansai group."
+  (let ((date (when (re-search-forward "[\t\n ]*\
+\\(20[0-9][0-9]\\)/\\([01]?[0-9]\\)/\\([0-3][0-9]\\)[\t\n ]*配信[\t\n ]*<"
+				       nil t)
+		(prog1
+		    (shimbun-nikkei-make-date-string
+		     (string-to-number (match-string 1))
+		     (string-to-number (match-string 2))
+		     (string-to-number (match-string 3)))
+		  (goto-char (point-min))))))
+    (when (and (re-search-forward "\
+<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"detailframe\\(?: clearfix\"\\)?"
+				  nil t)
+	       (shimbun-end-of-tag "div" t))
+      (goto-char (match-end 3))
+      (insert "\n" shimbun-nikkei-content-end)
+      (goto-char (match-beginning 3))
+      (insert shimbun-nikkei-content-start)
+      (when date
+	(shimbun-header-set-date header date))
+      t)))
 
 (defun shimbun-nikkei-prepare-article-sports (&rest args)
   "Function used to prepare contents of an article for the sports group."
   (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"MIDASHI\"[\t\n ]*-->"
+<\\([^\t\n >]+\\)[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+\\(?:class=\"photo\"\\|summary=\"写真ニュース\"\\)[^>]*>[\t\n ]*\
+\\|<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"MIDASHI\"[\t\n ]*-+>[\t\n ]*"
 			   nil t)
+    (let ((start (match-end 0))
+	  st nd)
+      (if (and (match-beginning 1)
+	       (progn
+		 (goto-char (match-beginning 1))
+		 (shimbun-end-of-tag (match-string 1) t))
+	       (progn
+		 (setq st (match-beginning 3)
+		       nd (match-end 3))
+		 (re-search-forward "\
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME[\t\n ]*=[\t\n ]*\"HONBUN\"[\t\n ]*\
+-+>[\t\n ]*"
+				    nil t)))
+	  (progn
+	    (delete-region nd (match-end 0))
+	    (insert "\n")
+	    (goto-char st))
+	(goto-char start)))
     (insert shimbun-nikkei-content-start)
     (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-->"
+<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>"
 			     nil t)
       (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
+      (insert shimbun-nikkei-content-end)
+      t)))
 
 (defun shimbun-nikkei-prepare-article-newpro (&rest args)
   "Function used to prepare contents of an article for the newpro group."
@@ -1507,11 +1812,11 @@
       (when (search-forward "</table>" nil t)
 	(setq photo-end (point))))
     (when (and (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]+-->[\t\n ]*"
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>[\t\n ]*"
 				  nil t)
 	       (setq body (point))
 	       (re-search-forward "\
-\[\t\n ]*<!--[\t\n ]*FJZONE[\t\n ]*END[\t\n ]*NAME=\"HONBUN\""
+\[\t\n ]*<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\""
 				  nil t))
       (goto-char (match-beginning 0))
       (insert shimbun-nikkei-content-end)
@@ -1520,83 +1825,71 @@
 	    (delete-region photo-end body)
 	    (goto-char (point-min)))
 	(goto-char body))
-      (insert shimbun-nikkei-content-start))))
+      (insert shimbun-nikkei-content-start)
+      t)))
 
 (defun shimbun-nikkei-prepare-article-release (&rest args)
   "Function used to prepare contents of an article for the release group."
-  (shimbun-remove-tags "<p[\t\n ]+class=\"re_print\"" "</p>")
+  (shimbun-remove-tags "\\(p\\)[\t\n ]+class=\"re_print\"" t)
   (goto-char (point-min))
   (when (re-search-forward "<[\t\n ]*TD[\t\n ]+colspan=\"3\">" nil t)
     (insert shimbun-nikkei-content-start)
     (when (re-search-forward "[\t\n ]*<div[\t\n ]+class=\"tokushu\">" nil t)
       (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
+      (insert shimbun-nikkei-content-end)
+      t)))
+
+(defun shimbun-nikkei-prepare-article-release2 (&rest args)
+  "Function used to prepare contents of an article for the release groups."
+  (when (re-search-forward ">[\t\n ]*このページをプリントする[\t\n ]*\
+\\(?:\\(?:<[^>]+>*[\t\n ]*\\)*<h[0-9]+\\(?:[\t\n ]+[^>]+\\)*\
+\[\t\n ]+[^\t\n >]+[\t\n ]*=[\t\n ]*\"[\t\n ]*heading[\t\n ]*\"[^>]*>\
+\[^<]+</h[0-9]+>\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\\)?"
+			   nil t)
+    (insert shimbun-nikkei-content-start)
+    (and (re-search-forward "[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*\
+<div\\(?:[\t\n ]+[^>]+\\)*[\t\n ]+class[\t\n ]*=[\t\n ]*\"[\t\n ]*\
+tokushu[\t\n ]*\""
+			    nil t)
+	 (goto-char (match-beginning 0)))
+    (insert shimbun-nikkei-content-end)
+    t))
 
 (defun shimbun-nikkei-prepare-article-market (header)
   "Function used to prepare contents of an article for the market group."
   (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-->"
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>"
 			   nil t)
     (insert shimbun-nikkei-content-start)
-    (when (re-search-forward "\\((\\([012]?[0-9]:[0-5]?[0-9]\\))[\t\n ]*\\)?\
-<!--[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-->"
+    (when (re-search-forward "\\(?:(\\([012]?[0-9]:[0-5]?[0-9]\\))[\t\n ]*\\)?\
+<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>"
 			     nil t)
-      (if (match-beginning 2)
+      (if (match-beginning 1)
 	  (progn
-	    (goto-char (1+ (match-end 2)))
-	    (let ((new (match-string 2))
+	    (goto-char (1+ (match-end 1)))
+	    (let ((new (match-string 1))
 		  (date (shimbun-header-date header)))
 	      (when (string-match "[012]?[0-9]:[0-5]?[0-9]" date)
 		(shimbun-header-set-date
 		 header (replace-match new nil nil date)))))
 	(goto-char (match-beginning 0)))
-      (insert shimbun-nikkei-content-end))))
+      (insert shimbun-nikkei-content-end)
+      t)))
 
-(defun shimbun-nikkei-prepare-article-okuyami (&rest args)
-  "Function used to prepare contents of an article for the okuyami group."
+(defun shimbun-nikkei-prepare-article-default4 (&rest args)
+  "Function used to prepare contents of an article for some groups."
   (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-->"
+<!-+[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>\
+\\|</h2>\n[\t\n ]+<p>"
 			   nil t)
     (insert shimbun-nikkei-content-start)
     (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-->"
+<!-+[\t\n ]*FJZONE[\t\n ]+END[\t\n ]+NAME=\"HONBUN\"[\t\n ]*-+>\
+\\|<script[\t\n ]+language=\"javascript\"[\t\n ]+type=\"text/javascript\">"
 			     nil t)
       (goto-char (match-beginning 0))
-      (insert shimbun-nikkei-content-end))))
-
-(eval-and-compile
-  (autoload 'japanese-hankaku "japan-util"))
-
-(defun shimbun-nikkei-prepare-article-report (header)
-  "Function used to prepare contents of an article for the report group."
-  (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]+START[\t\n ]+NAME=\"HONBUN\"[\t\n ]+-->"
-			   nil t)
-    (insert shimbun-nikkei-content-start)
-    (let ((start (point)))
-      (when (re-search-forward "\
-<!--[\t\n ]*FJZONE[\t\n ]*END[\t\n ]*NAME=\"HONBUN\"[\t\n ]+-->"
-			       nil t)
-	(goto-char (match-beginning 0))
-	(insert shimbun-nikkei-content-end)
-	(when (and (re-search-backward "\
-\\([2２][0０][0-9０-９][0-9０-９]\\)年\
-\\([01０１]?[0-9０-９]\\)月\
-\\([0-3０-３]?[0-9０-９]\\)日"
-				       start t)
-		   (or (memq (char-before (match-beginning 0))
-			     '(?\[ ?\〔 ?\［))
-		       (eq (char-after (match-end 0)) ?\〕)))
-	  ;; Note: `japanese-hankaku' breaks `match-data'.
-	  (let ((year (match-string 1))
-		(month (match-string 2))
-		(day (match-string 3)))
-	    (shimbun-header-set-date
-	     header
-	     (shimbun-make-date-string
-	      (string-to-number (japanese-hankaku year))
-	      (string-to-number (japanese-hankaku month))
-	      (string-to-number (japanese-hankaku day))))))))))
+      (insert shimbun-nikkei-content-end)
+      t)))
 
 (provide 'sb-nikkei)
 
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-nytimes.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-opentechpress-jp.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-orca.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-orca.el
--- work/emacs-w3m-1.4.4/shimbun/sb-orca.el	2005-03-14 07:14:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-orca.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-palmfan.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-palmfan.el
--- work/emacs-w3m-1.4.4/shimbun/sb-palmfan.el	2005-03-10 17:54:27.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-palmfan.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 (require 'shimbun)
@@ -57,6 +57,12 @@
 
 (defvar shimbun-palmfan-expiration-days 6)
 
+(defvar shimbun-palmfan-x-face-alist
+  '(("default" . "X-Face: \"<kvsju9lZL34FJ5jQUOZ|uEZf2(W2aw>dU62umIQL4j!$\
+eGluPC0(*l4^GB8v\n diqCIs\\6@p\\TN#{@;s*NMI'@\\[8Z8M*:5g}\
+`c9yC}F6e\\}DqeZo!LB>(hEF|P+U.b|#\n >$@]5@PdGIwuU4=`imfei\
+i$PdWyuHC8!1=KH'r,R=fV])N6uQS")))
+
 (luna-define-method initialize-instance :after ((shimbun shimbun-palmfan)
 						&rest init-args)
   (shimbun-palmfan-set-content-hash-internal
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-pcweb-column.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pcweb-column.el
--- work/emacs-w3m-1.4.4/shimbun/sb-pcweb-column.el	2005-03-14 07:31:25.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pcweb-column.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,8 +1,10 @@
 ;;; sb-pcweb-column.el --- shimbun backend for PC WEB COLUMN Square
 
-;; Copyright (C) 2002, 2003, 2004 OHASHI Akira <bg66@koka-in.org>
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+;; OHASHI Akira <bg66@koka-in.org>
 
 ;; Author: OHASHI Akira <bg66@koka-in.org>
+;;         Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -18,28 +20,35 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-pcweb-column (shimbun shimbun-text) ())
+(luna-define-class shimbun-pcweb-column (shimbun) ())
+
+(defvar shimbun-pcweb-column-url "http://journal.mycom.co.jp/column/")
 
-(defvar shimbun-pcweb-column-url "http://pcweb.mycom.co.jp/column/")
 (defvar shimbun-pcweb-column-groups
   '(;; Under a series
-    "itshihonron" "osx" "yetanother" "svalley" "winxp" "sopinion"
-    "toolexp" "rikei"
+    "jsr" "yume" "hreceipe" "kita" "shonanlife" "kaden" "nemurenai" "komono"
+    "js" "en" "motherboard" "svalley" "architecture" "motorlife" "nihongoprog"
+    "objc" "ide" "music" "itsecurity" "soundvisual" "osx" "sopinion" "ebook"
+    "orerobo" "zsh" "rikei" "lifehack" "world" "guutara" "volt" "textclean"
+    "person" "web20" "system"
     ;; Series end
-    "game" "asia" "scramble" "hitech" "bytes" "benri"))
+    "itshihonron" "yetanother" "asia" "benri" "bytes" "game" "hitech" "java"
+    "jisakuparts" "scramble" "toolexp" "winvista" "winxp" "interview" "ityougo"
+    "kimeuchi" "stratesys" "toyagain"))
+
 (defvar shimbun-pcweb-column-from-address "pcmail@pc.mycom.co.jp")
-(defvar shimbun-pcweb-column-content-start "<!-- #BeginEditable \"contents\" -->")
+(defvar shimbun-pcweb-column-content-start
+  "<!-- #BeginEditable \"contents\" -->")
 (defvar shimbun-pcweb-column-content-end "<!-- #EndEditable -->")
 (defvar shimbun-pcweb-column-coding-system 'shift_jis)
 
@@ -53,14 +62,16 @@
 	(headers)
 	(pattern
 	 (format
-	  "<a href=\"\\(/column/%s/\\([0-9][0-9][0-9]\\)/\\)\">\\([^<]+\\)</a>"
+	  "<a href=\"\\(/column/%s/\\([0-9][0-9][0-9]\\)\
+/?\\(index.html?\\)?\\)\">\\([^<]+\\)</a>"
 	  (regexp-quote (shimbun-current-group shimbun)))))
     (goto-char (point-min))
     (while (re-search-forward pattern nil t)
       (let ((url (match-string 1))
 	    (num (match-string 2))
-	    (subject (match-string 3))
+	    (subject (match-string 4))
 	    id)
+	;; do not modify for compatibility.
 	(setq id (format "<%s.%s.column@pcweb.mycom.co.jp>"
 			 num (shimbun-current-group-internal shimbun)))
 	(push (shimbun-make-header
@@ -87,16 +98,17 @@
   (let (case-fold-search)
     (goto-char (point-min))
     (when (re-search-forward "<!-- #BeginEditable \"author\" -->\
-\\([^<]+\\)<!-- #EndEditable -->" nil t)
-      (shimbun-header-set-from header (match-string 1)))
+\\(<p[^>]*>\\)?\\([^<]+\\)\\(</p>\\)?<!-- #EndEditable -->" nil t)
+      (shimbun-header-set-from header (match-string 2)))
     (goto-char (point-min))
-    (when (re-search-forward "<!-- #BeginEditable \"ContentsDate\" -->\
-\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)<!-- #EndEditable -->" nil t)
+    (when (re-search-forward "<!-- #BeginEditable \"[Cc]ontentsDate\" -->\
+\\(<p[^>]*>\\)?\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)\\(</p>\\)?\
+<!-- #EndEditable -->" nil t)
       (shimbun-header-set-date header
 			       (shimbun-make-date-string
-				(string-to-number (match-string 1))
 				(string-to-number (match-string 2))
-				(string-to-number (match-string 3)))))))
+				(string-to-number (match-string 3))
+				(string-to-number (match-string 4)))))))
 
 (provide 'sb-pcweb-column)
 
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-perlentaucher-de.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-pilot-link.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pilot-link.el
--- work/emacs-w3m-1.4.4/shimbun/sb-pilot-link.el	2005-03-14 07:14:42.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pilot-link.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-pilot-mailsync.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pilot-mailsync.el
--- work/emacs-w3m-1.4.4/shimbun/sb-pilot-mailsync.el	2005-03-14 07:14:42.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pilot-mailsync.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-plucker.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-plucker.el
--- work/emacs-w3m-1.4.4/shimbun/sb-plucker.el	2005-03-14 07:14:42.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-plucker.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-pocketgames.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pocketgames.el
--- work/emacs-w3m-1.4.4/shimbun/sb-pocketgames.el	2005-03-24 17:01:14.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-pocketgames.el	2008-01-18 08:38:36.000000000 +0900
@@ -1,11 +1,11 @@
 ;;; sb-pocketgames.el --- shimbun backend class for www.pocketgames.jp. -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2005, 2008 NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
-;; Version: $Id: sb-pocketgames.el,v 1.10.2.3 2005/03/24 08:01:14 yamaoka Exp $
-;; Last Modified: $Date: 2005/03/24 08:01:14 $
+;; Version: $Id: sb-pocketgames.el,v 1.18 2008-01-17 23:38:36 yamaoka Exp $
+;; Last Modified: $Date: 2008-01-17 23:38:36 $
 
 ;; This file is a part of shimbun.
 
@@ -20,15 +20,12 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 
 (eval-and-compile
@@ -86,7 +83,7 @@
 	  (shimbun-remove-markup)
 	  (setq subject (buffer-string)))
 	(setq url (shimbun-expand-url
-		   (w3m-decode-anchor-string url)
+		   (shimbun-decode-anchor-string url)
 		   (concat (shimbun-index-url shimbun) "/")))
 	(push (shimbun-make-header
 	       0 (shimbun-mime-encode-string subject)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-rakuten.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rakuten.el
--- work/emacs-w3m-1.4.4/shimbun/sb-rakuten.el	2005-03-14 07:25:38.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rakuten.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-rakuten.el --- shimbun backend for rakuten diary -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2006 NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -58,19 +58,6 @@
   (format "http://api.plaza.rakuten.ne.jp/%s/rss/"
 	  (shimbun-current-group-internal shimbun)))
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-rakuten) url date)
-  (unless (string-match
-	   "http://\\([^\/]+\\)/[^\/]+/[^\/]+/\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)"
-	   url)
-    (error "Cannot find a message-id base"))
-    (format "%s%s%s%%%s@%s"
-	    (match-string-no-properties 2 url)
-	    (match-string-no-properties 3 url)
-	    (match-string-no-properties 4 url)
-	    (shimbun-current-group-internal shimbun)
-	    (match-string-no-properties 1 url)))
-
 (luna-define-method shimbun-rss-get-date
   ((shimbun shimbun-rakuten) url)
   (unless (string-match
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-redhat.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-redhat.el
--- work/emacs-w3m-1.4.4/shimbun/sb-redhat.el	2003-11-18 10:57:35.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-redhat.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-rediff.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rediff.el
--- work/emacs-w3m-1.4.4/shimbun/sb-rediff.el	2005-03-10 17:54:25.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rediff.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-rediff.el --- shimbun backend for rediff.com
 
-;; Copyright (C) 2004, 2005 S V N Vishwanathan <vishketan@yahoo.com>
+;; Copyright (C) 2004, 2005, 2006, 2010 S V N Vishwanathan <vishketan@yahoo.com>
 
 ;; Author: S V N Vishwanathan <vishketan@yahoo.com>
 ;; Keywords: news
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -34,9 +34,10 @@
 
 (defvar shimbun-rediff-url "http://www.rediff.com/rss/newsrss.xml")
 (defvar shimbun-rediff-groups '("news"))
-(defvar shimbun-rediff-from-address  "news@rediff.com")
+(defvar shimbun-rediff-from-address "news@rediff.com")
 (defvar shimbun-rediff-content-start "<BR></FONT>")
-(defvar shimbun-rediff-content-end "</P></FONT></TD></TR><TR><TD>")
+(defvar shimbun-rediff-content-end
+  "\\(</P>\\)?</FONT>\\(</FONT>\\)?</TD></TR><TR><TD>")
 
 (defconst shimbun-rediff-month-alist
   '(("January" . 1) ("February" . 2) ("March" . 3) ("April" . 4)
@@ -45,50 +46,50 @@
 
 ;; Print version has less ads
 
-(luna-define-method shimbun-article-url ((shimbun shimbun-rediff) header)
-  (let ((url (shimbun-article-base-url shimbun header)))
-    (if (string-match "http://www.rediff.com/rss/redirect.php\\?url=\
-http://www.rediff.com/\\(.+\\.htm\\)" url)
-	(concat "http://in.rediff.com/cms/print.jsp?docpath="
-		(match-string-no-properties 1 url))
-      url)))
-
-;; Three kinds of tags to strip from the print version
-
-;; Type 1:
-;; <P align=center>
-;; <B><A class="" target=new href="blah"> blah blah </A></B>
-;; </P>
-
-;; Type 2:
-;;<TABLE cellSpacing=0 cellPadding=0 width=200 align=left border=0>
-;; blah blah!
-;; </TABLE></TD></TR></TABLE>
-
-;; Type 3:
-;;<UL><LI><STRONG>
-;; <A class="" href="blah" target=new> blah blah </A>
-;; </STRONG></LI></UL><P>
+(luna-define-method shimbun-article :before
+  ((shimbun shimbun-rediff) header &optional outbuf)
+  (let ((url (shimbun-article-url shimbun header)))
+    (unless
+	(string-match
+	 "http://www.rediff.com/rss/redirect.php\\?url=\
+http://www.rediff.com/\\(.+\\.htm\\)"
+	 url)
+      (error "Malformed URL? %s" url))
+    (shimbun-header-set-xref
+     header
+     (concat
+      "http://in.rediff.com/cms/print.jsp?docpath="
+      (match-string-no-properties 1 url)))))
+
+;; Tags to strip from the print version
 
 (luna-define-method shimbun-clear-contents :before
   ((shimbun shimbun-rediff) header)
   (when (luna-call-next-method)
-    (shimbun-remove-tags "<P align=center><A [^>]+>" "</A>\\(</P>\\| \\)")
+    (shimbun-remove-tags "\\(A\\) \\(?:class=\"\"\\|target=new\\)" t)
+    (shimbun-remove-tags "<P><STRONG>" "</STRONG></A>")
+    (shimbun-remove-tags "<P><STRONG>Also read:" "</STRONG>\\(</P>\\)?")
+    (shimbun-remove-tags "<UL[^>]*><LI[^>]*>" "</LI></UL>")
     (shimbun-remove-tags
      "<TABLE cellSpacing=0 cellPadding=0 width=200 align=left border=0>"
-     "</TABLE></TD></TR></TABLE>"  )
-    (shimbun-remove-tags "<UL[^>]*><LI[^>]*><STRONG>" "</STRONG></LI></UL>")))
+     "</TABLE></TD></TR></TABLE>")))
 
 ;; The default header has no date string
 ;; We need to parse it from the contents and set the header
 
 (luna-define-method shimbun-make-contents :before
   ((shimbun shimbun-rediff) header)
+;;; <DEBUG>
+;;  (shimbun-rediff-make-contents shimbun header))
+;;
+;;(defun shimbun-rediff-make-contents (shimbun header)
+;;; </DEBUG>
   (setq case-fold-search nil)
   (when (re-search-forward
 	 "\\(January\\|February\\|March\\|April\\|May\\|June\
-\\|July\\|August\\|September\\|October\\|November\\|December\\)  \
-\\([0-3][0-9]\\), \\(20[0-9][0-9]\\) | \\([0-1][0-9]:[0-6][0-9]\\) IST" nil t)
+\\|July\\|August\\|September\\|October\\|November\\|December\\)[ ]+\
+\\([0-3][0-9]\\),[ ]+\\(20[0-9][0-9]\\) | \\([0-2][0-9]:[0-6][0-9]\\) IST"
+	 nil t)
     (shimbun-header-set-date
      header
      (shimbun-make-date-string
@@ -99,20 +100,6 @@
       "+05:30"))
     (goto-char (point-min))))
 
-;; Build unique ID for the message
-
-(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-rediff)
-						  url date)
-  (unless (string-match "http://www.rediff.com/rss/redirect.php\\?url=\
-http://www.rediff.com/\\([A-Za-z]+\\)/\\([0-9]+\\)/\\([^/]+\\)/\\(.+\\)\\.htm"
-			url)
-    (error (concat "Cannot find a message-id base for " url) ))
-  (format "<%s%s%s%s@rediff.com>"
-	  (match-string-no-properties 1 url)
-	  (match-string-no-properties 2 url)
-	  (match-string-no-properties 3 url)
-	  (match-string-no-properties 4 url)))
-
 (provide 'sb-rediff)
 
 ;;; sb-rediff.el ends here
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-rss-blogs.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-rss-hash.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-rss.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rss.el
--- work/emacs-w3m-1.4.4/shimbun/sb-rss.el	2005-02-22 10:59:05.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-rss.el	2013-05-09 08:55:13.000000000 +0900
@@ -1,7 +1,7 @@
 ;;; sb-rss.el --- shimbun backend for RSS (Rich Site Summary).
 
-;; Copyright (C) 2003, 2004, 2005 Koichiro Ohba <koichiro@meadowy.org>
-;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
+;; Copyright (C) 2003-2011, 2013 Koichiro Ohba <koichiro@meadowy.org>
+;; Copyright (C) 2003-2011, 2013 NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
 
 ;; Author: Koichiro Ohba <koichiro@meadowy.org>
 ;;         NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -39,7 +39,19 @@
     (require 'xml)))
 (eval '(require 'xml))
 
-(luna-define-class shimbun-rss (shimbun) ())
+(eval-and-compile
+  (luna-define-class shimbun-rss (shimbun) (ignored-subject)))
+
+(luna-define-method initialize-instance :after ((shimbun shimbun-rss)
+						&rest init-args)
+  (shimbun-rss-initialize-ignored-subject shimbun))
+
+(defun shimbun-rss-initialize-ignored-subject (shimbun)
+  (luna-set-slot-value shimbun 'ignored-subject
+		       (symbol-value
+			(intern-soft (format "shimbun-%s-ignored-subject"
+					     (shimbun-server shimbun)))))
+  shimbun)
 
 (luna-define-generic shimbun-rss-process-date (shimbun-rss date)
   "Process DATE string and return proper Date string to show it in MUA.")
@@ -129,17 +141,29 @@
 (luna-define-method shimbun-rss-get-date ((shimbun shimbun-rss) url)
   nil)
 
-(luna-define-generic shimbun-rss-build-message-id (shimbun-rss url date)
-  "Build unique message-id from URL and DATE and return it.")
+(luna-define-generic shimbun-rss-build-message-id (shimbun-rss
+						   url &optional date)
+  "Build unique message-id from URL and (optionally) DATE, and return it.")
+
+(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-rss)
+						  url &optional date)
+  (when (string-match "[?#]" url)
+    (setq url (substring url 0 (match-beginning 0))))
+  (concat "<" (md5 url) "%" (shimbun-current-group shimbun)
+	  "@" (shimbun-server shimbun) ".shimbun.namazu.org>"))
 
 (luna-define-method shimbun-headers ((shimbun shimbun-rss) &optional range)
   (with-temp-buffer
     (let ((case-fold-search t))
       (shimbun-retrieve-url
        (shimbun-index-url shimbun) 'no-cache 'no-decode)
-      (goto-char (point-min))
-      (decode-coding-region (point-min) (point-max) (shimbun-rss-get-encoding))
-      (set-buffer-multibyte t)
+      ;; In some rss feeds, LFs might be used mixed with CRLFs.
+      (shimbun-strip-cr)
+      (insert
+       (prog1
+	   (decode-coding-string (buffer-string) (shimbun-rss-get-encoding))
+	 (erase-buffer)
+	 (set-buffer-multibyte t)))
       (shimbun-get-headers shimbun range))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-rss)
@@ -148,24 +172,70 @@
 
 (defun shimbun-rss-get-headers (shimbun &optional range
 					need-descriptions need-all-items)
-  (static-when (featurep 'xemacs)
-    ;; It's one of many bugs in XEmacs that the coding systems *-dos
-    ;; provided by Mule-UCS don't convert CRLF to LF when decoding.
-    (shimbun-strip-cr))
-  (let ((xml (condition-case err
-		 (xml-parse-region (point-min) (point-max))
-	       (error
-		(message "Error while parsing %s: %s"
-			 (shimbun-index-url shimbun)
-			 (error-message-string err))
-		nil)))
-	dc-ns rss-ns author headers)
-    (when xml
-      (setq dc-ns (shimbun-rss-get-namespace-prefix
-		   xml "http://purl.org/dc/elements/1.1/")
-	    rss-ns (shimbun-rss-get-namespace-prefix
-		    xml "http://purl.org/rss/1.0/")
-	    author
+  "Get headers from rss feed described by SHIMBUN.
+RANGE is currently ignored.  If NEED-DESCRIPTIONS, include node
+text as description.  By default, only existing and new items
+from the feed are returned, i.e., those items which are newer
+than the oldest one in the shimbun.  If NEED-ALL-ITEMS is
+non-nil, all items from the feed are returned.  If the entries
+from the feed have date information, the result is sorted by
+ascending date."
+  (let* ((xml (if (or debug-on-error debug-on-quit)
+		  (shimbun-xml-parse-buffer)
+		(condition-case err
+		    (shimbun-xml-parse-buffer)
+		  (error
+		   (message "Error while parsing %s: %s"
+			    (shimbun-index-url shimbun)
+			    (error-message-string err))
+		   nil))))
+	 header headers oldheaders newheaders oldest)
+    (dolist (tmp (shimbun-rss-get-headers-1 xml shimbun need-descriptions))
+      (let* ((date (shimbun-header-date tmp))
+	     (ftime
+	      (when (and (stringp date)
+			 (> (length date) 1))
+		(w3m-float-time (date-to-time date)))))
+	(push (list tmp ftime) headers)))
+    (when headers
+      (if (or need-all-items
+	      ;; If there's a header without date information, we
+	      ;; return everything, just to be safe.
+	      (memq nil (mapcar 'cadr headers)))
+	  (mapcar 'car headers)
+	;; Otherwise, sort according to date.
+	(setq headers
+	      (sort headers (lambda (a b)
+			      (> (cadr a) (cadr b)))))
+	(while headers
+	  (setq header (pop headers))
+	  (if (shimbun-search-id shimbun (shimbun-header-id (car header)))
+	      (push header oldheaders)
+	    (push header newheaders)))
+	(if (null oldheaders)
+	    ;; All items are new
+	    (mapcar 'car newheaders)
+	  ;; Delete all items which are older than the ones we already
+	  ;; have
+	  (setq oldest (cadr (car oldheaders)))
+	  (while (and newheaders
+		      (> oldest (cadr (car newheaders))))
+	    (setq newheaders (cdr newheaders)))
+	  (append
+	   (mapcar 'car newheaders)
+	   (mapcar 'car oldheaders)))))))
+
+(defun shimbun-rss-get-headers-1 (xml shimbun need-descriptions)
+  "Retrieve all items found in XML for SHIMBUN and return headers.
+If NEED-DESCRIPTIONS, include node text as description."
+  (when xml
+    (let  ((dc-ns (shimbun-rss-get-namespace-prefix
+		   xml "http://purl.org/dc/elements/1.1/"))
+	   (rss-ns (shimbun-rss-get-namespace-prefix
+		    xml "http://purl.org/rss/1.0/"))
+	   (ignored-subject (luna-slot-value shimbun 'ignored-subject))
+	   author hankaku headers)
+      (setq author
 	    (catch 'found-author
 	      (dolist (channel
 		       (shimbun-rss-find-el (intern (concat rss-ns "channel"))
@@ -174,54 +244,84 @@
 		       (or
 			(shimbun-rss-node-text rss-ns 'author channel)
 			(shimbun-rss-node-text dc-ns 'creator channel)
-			(shimbun-rss-node-text dc-ns 'contributor channel))))))
-      (dolist (item (shimbun-rss-find-el (intern (concat rss-ns "item")) xml))
-	(let ((url (and (listp item)
-			(eq (intern (concat rss-ns "item")) (car item))
-			(shimbun-rss-node-text rss-ns 'link (cddr item)))))
-	  (when url
-	    (let* ((date (or (shimbun-rss-get-date shimbun url)
-			     (shimbun-rss-node-text dc-ns 'date item)
-			     (shimbun-rss-node-text rss-ns 'pubDate item)))
-		   (id (shimbun-rss-build-message-id shimbun url date)))
-	      (when (or need-all-items
-			(not (shimbun-search-id shimbun id)))
-		(push (shimbun-create-header
-		       0
-		       (shimbun-rss-node-text rss-ns 'title item)
-		       (or (shimbun-rss-node-text rss-ns 'author item)
-			   (shimbun-rss-node-text dc-ns 'creator item)
-			   (shimbun-rss-node-text dc-ns 'contributor item)
-			   author
-			   (shimbun-from-address shimbun))
-		       (shimbun-rss-process-date shimbun date)
-		       id "" 0 0 url
-		       (when need-descriptions
-			 (let ((description (shimbun-rss-node-text
-					     rss-ns 'description item)))
-			   (when description
-			     (list (cons 'description description))))))
-		      headers))))))
-      headers)))
+			(shimbun-rss-node-text dc-ns 'contributor channel)))))
+	    hankaku (unless (memq (shimbun-japanese-hankaku shimbun)
+				  '(body nil))
+		      (generate-new-buffer " *temp*")))
+      (unwind-protect
+	  (dolist (item (shimbun-rss-find-el (intern (concat rss-ns "item"))
+					     xml)
+			headers)
+	    (let ((url (and (listp item)
+			    (eq (intern (concat rss-ns "item")) (car item))
+			    (shimbun-rss-node-text rss-ns 'link (cddr item)))))
+	      (when url
+		(let* ((date (or (shimbun-rss-get-date shimbun url)
+				 (shimbun-rss-node-text dc-ns 'date item)
+				 (shimbun-rss-node-text rss-ns 'pubDate item)))
+		       (id (shimbun-rss-build-message-id shimbun url date))
+		       (subject (shimbun-rss-node-text rss-ns 'title item)))
+		  (when id
+		    (unless (and ignored-subject subject
+				 (string-match ignored-subject subject))
+		      (push
+		       (shimbun-create-header
+			0
+			(if hankaku
+			    (with-current-buffer hankaku
+			      (insert (or subject ""))
+			      (shimbun-japanese-hankaku-region (point-min)
+							       (point-max))
+			      (prog1 (buffer-string) (erase-buffer)))
+			  subject)
+			(or (shimbun-rss-node-text rss-ns 'author item)
+			    (shimbun-rss-node-text dc-ns 'creator item)
+			    (shimbun-rss-node-text dc-ns 'contributor item)
+			    author
+			    (shimbun-from-address shimbun))
+			(shimbun-rss-process-date shimbun date)
+			id "" 0 0 url
+			(when need-descriptions
+			  (let ((description (shimbun-rss-node-text
+					      rss-ns 'description item)))
+			    (when description
+			      (list (cons 'description description))))))
+		       headers)))))))
+	(when (buffer-live-p hankaku)
+	  (kill-buffer hankaku))))))
 
 ;;; Internal functions
 
 ;;; XML functions
 
+(defvar shimbun-rss-compatible-encoding-alist
+  '((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.")
+
 (defun shimbun-rss-get-encoding ()
-  (let (end encoding)
-    (cond
-     ((search-forward "<?" nil t nil)
-      (let ((pos (point)))
-	(setq end (search-forward "?>"))
-	(goto-char pos))
-      (setq encoding
-	    (if (re-search-forward "encoding=\"\\([^ ]+\\)\"" end t)
-		(downcase (match-string-no-properties 1))
-	      "utf-8")))
-     (t ;; XML Default encoding.
-      (setq encoding "utf-8")))
-    (intern-soft (concat encoding "-dos"))))
+  "Return an encoding attribute specified in the current xml contents.
+If `shimbun-rss-compatible-encoding-alist' specifies the compatible
+encoding, it is used instead.  If the xml contents doesn't specify the
+encoding, return `utf-8' which is the default encoding for xml if it
+is available, otherwise return nil."
+  (goto-char (point-min))
+  (if (re-search-forward
+       "<\\?[^>]*encoding=\\(\"\\([^\">]+\\)\"\\|'\\([^'>]+\\)'\\)"
+       nil t)
+      (let ((encoding (intern (downcase (or (match-string 2)
+					    (match-string 3))))))
+	(or
+	 (shimbun-find-coding-system
+	  (cdr (assq encoding shimbun-rss-compatible-encoding-alist)))
+	 (shimbun-find-coding-system encoding)
+	 (shimbun-find-coding-system
+	  (car (rassq encoding shimbun-rss-compatible-encoding-alist)))))
+    (shimbun-find-coding-system 'utf-8)))
 
 (defun shimbun-rss-node-text (namespace local-name element)
   (let* ((node (assq (intern (concat namespace (symbol-name local-name)))
@@ -230,7 +330,8 @@
 		   (shimbun-rss-node-just-text node)
 		 node))
 	 (cleaned-text (if text (shimbun-replace-in-string
-				 text "^[ \000-\037\177]+\\|[ \000-\037\177]+$" ""))))
+				 text "^[ \000-\037\177]+\\|[ \000-\037\177]+$"
+				 ""))))
     (if (string-equal "" cleaned-text)
 	nil
       cleaned-text)))
@@ -241,26 +342,23 @@
     node))
 
 (defun shimbun-rss-find-el (tag data &optional found-list)
-  "Find the all matching elements in the data.  Careful with this on
-large documents!"
-  (if (listp data)
-      (mapcar (lambda (bit)
-		(if (car-safe bit)
-		    (progn (if (equal tag (car bit))
-			       (setq found-list
-				     (append found-list
-					     (list bit))))
-			   (if (and (listp (car-safe (caddr bit)))
-				    (not (stringp (caddr bit))))
-			       (setq found-list
-				     (append found-list
-					     (shimbun-rss-find-el
-					      tag (caddr bit))))
-			     (setq found-list
-				   (append found-list
-					   (shimbun-rss-find-el
-					    tag (cddr bit))))))))
-	      data))
+  "Find the all matching elements in the data.
+Careful with this on large documents!"
+  (when (consp data)
+    (dolist (bit data)
+      (when (car-safe bit)
+	(when (equal tag (car bit))
+	  ;; Old xml.el may return a list of string.
+	  (when (and (consp (caddr bit))
+		     (stringp (caaddr bit)))
+	    (setcar (cddr bit) (caaddr bit)))
+	  (setq found-list (append found-list (list bit))))
+	(if (and (consp (car-safe (caddr bit)))
+		 (not (stringp (caddr bit))))
+	    (setq found-list (append found-list
+				     (shimbun-rss-find-el tag (caddr bit))))
+	  (setq found-list (append found-list
+				   (shimbun-rss-find-el tag (cddr bit))))))))
   found-list)
 
 (defun shimbun-rss-get-namespace-prefix (el uri)
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-ruby.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ruby.el
--- work/emacs-w3m-1.4.4/shimbun/sb-ruby.el	2005-03-14 07:14:42.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-ruby.el	2009-05-21 08:13:31.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-ruby.el --- shimbun backend class for ruby ML archiver.
 
-;; Copyright (C) 2001, 2002, 2003, 2005
+;; Copyright (C) 2001, 2002, 2003, 2005, 2009
 ;; NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
 
 ;; Author: NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -50,7 +50,7 @@
 ;;
 ;;)
 
-(defsubst shimbun-ruby-parse-time (str)
+(defun shimbun-ruby-parse-time (str)
   (save-match-data
     (if (string-match
 	 "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\) \\([0-9]+:[0-9]+:[0-9]+\\)"
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-sankei.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sankei.el
--- work/emacs-w3m-1.4.4/shimbun/sb-sankei.el	2004-08-03 15:37:47.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sankei.el	2011-10-03 17:16:59.000000000 +0900
@@ -1,6 +1,6 @@
-;;; sb-sankei.el --- shimbun backend for the Sankei Shimbun -*- coding: iso-2022-7bit; -*-
+;;; sb-sankei.el --- shimbun backend for the MSN Sankei News -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004 Katsumi Yamaoka
+;; Copyright (C) 2003-2011 Katsumi Yamaoka
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news
@@ -18,51 +18,76 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
-(require 'shimbun)
+(require 'sb-rss)
+(require 'sb-multi)
 
-(luna-define-class shimbun-sankei (shimbun-japanese-newspaper shimbun) ())
+(luna-define-class shimbun-sankei (shimbun-japanese-newspaper
+				   shimbun-multi shimbun-rss) ())
 
-(defvar shimbun-sankei-top-level-domain "sankei.co.jp"
-  "Name of the top level domain for the Sankei shimbun.")
+(defvar shimbun-sankei-url "http://sankei.jp.msn.com/")
 
-(defvar shimbun-sankei-url
-  (concat "http://www." shimbun-sankei-top-level-domain "/")
-  "Name of the parent url.")
+(defvar shimbun-sankei-top-level-domain "sankei.jp.msn.com")
 
 (defvar shimbun-sankei-server-name "産経新聞")
 
-(defvar shimbun-sankei-from-address
-  (concat "webmaster@" shimbun-sankei-top-level-domain))
-
-(defvar shimbun-sankei-content-start
-  "<!--[\t\n ]*\\(photo\\.sta\\|\\(ad--\\)?hombun\\)[\t\n ]*-->[\t\n ]*")
-
-(defvar shimbun-sankei-content-end
-  "[\t\n ]*<!--[\t\n ]*hbnend[\t\n ]*-->")
-
 (defvar shimbun-sankei-group-table
-  '(("shakai" "社会" "news/shakai.htm")
-    ("sports" "スポーツ" "news/sports.htm")
-    ("keizai" "経済" "news/keizai.htm")
-    ("seiji" "政治" "news/seiji.htm")
-    ("kokusai" "国際" "news/kokusai.htm")
-    ("bungei" "文化・芸能" "news/bungei.htm")
-    ("book" "読書" "news/book.htm")
-    ("person" "ひと" "news/person.htm")
-    ("dead" "おくやみ" "news/dead.htm")))
+  '(("points" "注目ニュース"
+     "http://sankei.jp.msn.com/rss/news/points.xml")
+    ("flash" "速報"
+     "http://sankei.jp.msn.com/rss/news/flash.xml")
+    ("affairs" "事件"
+     "http://sankei.jp.msn.com/rss/news/affairs.xml")
+    ("politics" "政治"
+     "http://sankei.jp.msn.com/rss/news/politics.xml")
+    ("economy" "経済・IT"
+     "http://sankei.jp.msn.com/rss/news/economy.xml")
+    ("world" "国際"
+     "http://sankei.jp.msn.com/rss/news/world.xml")
+    ("sports" "スポーツ"
+     "http://sankei.jp.msn.com/rss/news/sports.xml")
+    ("entertainments" "エンタメ"
+     "http://sankei.jp.msn.com/rss/news/entertainments.xml")
+    ("life" "生活"
+     "http://sankei.jp.msn.com/rss/news/life.xml")
+    ("science" "科学"
+     "http://sankei.jp.msn.com/rss/news/science.xml")
+    ("region" "地方"
+     "http://sankei.jp.msn.com/rss/news/region.xml")
+    ;; 産経ニュース west
+    ("west.flash" "最新ニュース"
+     "http://sankei.jp.msn.com/rss/news/west_flash.xml")
+    ("west.points" "注目ニュース"
+     "http://sankei.jp.msn.com/rss/news/west_points.xml")
+    ("west.affairs" "できごと"
+     "http://sankei.jp.msn.com/rss/news/west_affairs.xml")
+    ("west.sports" "スポーツ"
+     "http://sankei.jp.msn.com/rss/news/west_sports.xml")
+    ("west.life" "ライフ"
+     "http://sankei.jp.msn.com/rss/news/west_life.xml")
+    ("west.economy" "経済"
+     "http://sankei.jp.msn.com/rss/news/west_economy.xml")
+    ;; Non-RSS groups.
+    ("column.sankeisho" "産経抄"
+     "http://sankei.jp.msn.com/column/topics/column-14576-t1.htm")
+    ("column.shucho" "主張"
+     "http://sankei.jp.msn.com/column/topics/column-14593-t1.htm")
+    ("column.seiron" "正論"
+     "http://sankei.jp.msn.com/column/topics/column-14594-t1.htm")))
 
 (defvar shimbun-sankei-x-face-alist
-  '(("default" . "X-Face: J@?(qGKd~^Tfa]pqTbgVxl61=+G<g7\\$mJ4}jj\
-z*[c{L!Zi-@2H~S{M>\"Y?}\"]ly',1[6oe\n *b+4?PL^)c5+h&[O=$SZ}D\"I%>\
-DP\\h.OTct|k28-/c`^B-=cDXV;.>3w`/X_.'n$~,<$:3nNe#Jy8Q\n 5l[|\"#w")))
+  '(("default" . "\
+Face: iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAGFBMVEX///8An/8Vb38CnwB
+ Vv1X/vwD/fwD/PwA35I7FAAAAAXRSTlMAQObYZgAAAFpJREFUCNdjYEAF5TC6vICBUYCBgR3MEBQ
+ ACoAZguwwhlJaWnoBA4OgkFFZWhqQwShspJaWFgDUK2yslpYKYjAbK4WGghgsLk6hoWBzXVzAAiA
+ hVgiDwQHZfgCXhRLQU+g42QAAAABJRU5ErkJggg==")))
 
 (defvar shimbun-sankei-expiration-days 7)
 
@@ -74,80 +99,199 @@
 		shimbun-sankei-group-table)))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-sankei))
-  (concat (shimbun-url-internal shimbun)
-	  (nth 2 (assoc (shimbun-current-group-internal shimbun)
-			shimbun-sankei-group-table))))
-
-(luna-define-method shimbun-get-headers ((shimbun shimbun-sankei)
-					 &optional range)
-  (when (re-search-forward "<!--[\t\n ]*mlist[\t\n ]*-->[\t\n ]*" nil t)
-    (delete-region (point-min) (point)))
-  (when (re-search-forward "[\t\n ]*<!--" nil t)
-    (delete-region (match-beginning 0) (point-max)))
-  (goto-char (point-min))
-  (let ((from (shimbun-from-address shimbun))
-	(group (shimbun-current-group-internal shimbun))
-	(case-fold-search t)
-	cyear cmonth month year headers)
-    (setq cyear (decode-time)
-	  cmonth (nth 4 cyear)
-	  cyear (nth 5 cyear))
-    (while (re-search-forward "<a[\t\n ]+href=\"\
-\\(\
-\\([/0-9a-z]+\\)\
-\\.htm\\)\
-\">[\t\n ]*\
-\\([^\n<>]+\\)\
-\[\t\n ]*</a>\\([\t\n ]*<[^<>]+>\\)*[\t\n ]*(\
-\\([01][0-9]\\)\
-/\
-\\([0-3][0-9]\\)\
-\[\t\n ]+\
-\\([012][0-9]:[0-5][0-9]\\)\
-)"
-			      nil t)
-      (setq month (string-to-number (match-string 5))
-	    year (cond ((>= (- month cmonth) 2)
-			(1- cyear))
-		       ((and (= 1 month) (= 12 cmonth))
-			(1+ cyear))
-		       (t
-			cyear)))
+  (nth 2 (assoc (shimbun-current-group-internal shimbun)
+		shimbun-sankei-group-table)))
+
+(defvar shimbun-sankei-retry-fetching 1)
+
+(luna-define-method shimbun-headers :around ((shimbun shimbun-sankei)
+					     &optional range)
+  (if (string-match "\\.xml\\'" (shimbun-index-url shimbun))
+      ;; Use the function defined in sb-rss.el.
+      (luna-call-next-method)
+    ;; Use the default function defined in shimbun.el.
+    (funcall (intern "shimbun-headers"
+		     (luna-class-obarray (luna-find-class 'shimbun)))
+	     shimbun range)))
+
+(luna-define-method shimbun-server-name :around ((shimbun shimbun-sankei))
+  (if (string-match "\\`west\\." (shimbun-current-group-internal shimbun))
+      "産経ニュース west"
+    (luna-call-next-method)))
+
+(luna-define-method shimbun-get-headers :around ((shimbun shimbun-sankei)
+						 &optional range)
+  (if (string-match "\\.xml\\'" (shimbun-index-url shimbun))
+      (luna-call-next-method)
+    (shimbun-sankei-get-headers shimbun range)))
+
+(defun shimbun-sankei-get-headers (shimbun range)
+  "Get headers for non-RSS groups."
+  (let* ((group (shimbun-current-group-internal shimbun))
+	 (name (shimbun-current-group-name shimbun))
+	 (regexp
+	  (concat
+	   (eval-when-compile
+	     (concat
+	      "<a[\t\n ]+href=\""
+	      ;; 1. url
+	      "\\(\\(?:[^\"/]+/\\)+"
+	      ;; 2. year
+	      "\\([0-9][0-9]\\)"
+	      ;; 3. month
+	      "\\([01][0-9]\\)"
+	      ;; 4. day
+	      "\\([0-3][0-9]\\)"
+	      "/"
+	      ;; 5. serial number
+	      "\\([^\"]+\\)"
+	      "\\.htm\\)"
+	      "\">[\t\n ]*\\(?:【"))
+	   ;; 6. subject
+	   ;; 7. time
+	   name "】\\)?[\t\n ]*\\([^<]+\\)</a>\
+\\(?:\\(?:[\t\n ]*<[^>]+>\\)*[\t\n ]*\
+\\(?:20[0-9][0-9]\\.\\)?[01]?[0-9]\\.[0-3]?[0-9][\t\n ]+\
+\\([012][0-9]:[0-5][0-9]\\)[\t\n ]*<\\)?"))
+	 (from (concat (shimbun-server-name shimbun) " (" name ")"))
+	 (rgrp (mapconcat 'identity (nreverse (split-string group "\\.")) "."))
+	 (index (shimbun-index-url shimbun))
+	 headers)
+    (while (re-search-forward regexp nil t)
       (push (shimbun-create-header
-	     ;; number
-	     0
-	     ;; subject
-	     (match-string 3)
-	     ;; from
-	     from
-	     ;; date
-	     (shimbun-make-date-string year month
-				       (string-to-number (match-string 6))
-				       (match-string 7))
-	     ;; id
-	     (concat "<"
-		     (mapconcat 'identity
-				(save-match-data
-				  (split-string (match-string 2) "/"))
-				".")
-		     "%" group "."
+	     0 (match-string 6) from
+	     (shimbun-make-date-string
+	      (+ 2000 (string-to-number (match-string 2)))
+	      (string-to-number (match-string 3))
+	      (string-to-number (match-string 4))
+	      (match-string 7))
+	     (concat "<" (match-string 5) "." rgrp "%"
 		     shimbun-sankei-top-level-domain ">")
-	     ;; references, chars, lines
 	     "" 0 0
-	     ;; xref
-	     (concat shimbun-sankei-url "news/" (match-string 1)))
+	     (shimbun-expand-url (match-string 1) index))
 	    headers))
     headers))
 
-(luna-define-method shimbun-clear-contents :before ((shimbun shimbun-sankei)
+(luna-define-method shimbun-multi-next-url ((shimbun shimbun-sankei)
+					    header url)
+  (shimbun-sankei-multi-next-url shimbun header url))
+
+(defun shimbun-sankei-multi-next-url (shimbun header url)
+  (goto-char (point-min))
+  (when (and (re-search-forward "<div[\t\n ]+class=\"pager\"" nil t)
+	     (shimbun-end-of-tag "div")
+	     (re-search-backward "\
+<a[\t\n ]+href=\"\\([^\"]+\\)\"[^>]*>[\t\n ]*次のページ"
+				 (match-beginning 0) t))
+    (shimbun-expand-url (match-string 1) url)))
+
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-sankei)
 						    header)
-  ;; Remove advertisements.
-  (shimbun-remove-tags "<!--[\t\n ]*AdSpace\\(.+=.+\\)+-->"
-		       "<!--[\t\n ]*/AdSpace[\t\n ]*-->")
-  ;; Remove an advertisement between photo and hombun.
-  (shimbun-remove-tags "<!--[\t\n ]*photo\\.end[\t\n ]*-->"
-		       "<!--[\t\n ]*hombun[\t\n ]*-->")
-  (goto-char (point-min)))
+  (shimbun-sankei-clear-contents shimbun header))
+
+(defun shimbun-sankei-clear-contents (shimbun header)
+  (goto-char (point-min))
+  (let ((group (shimbun-current-group-internal shimbun))
+	(hankaku (shimbun-japanese-hankaku shimbun))
+	(case-fold-search t)
+	start end)
+    (if (and (or (re-search-forward "<span[\t\n ]+class=\"timestamp\"" nil t)
+		 (re-search-forward "<!-+[\t\n ]+grok[\t\n ]+target[\t\n ]+\
+title[\t\n ]+end[\t\n ]+-+>"
+				    nil t))
+	     (progn
+	       (setq start (match-end 0))
+	       (re-search-forward "<div[\t\n ]+class=\"newstextfull\">[\t\n ]*"
+				  nil t))
+	     (progn
+	       (setq start (if (re-search-backward "<img[\t\n ]+src=\""
+						   start t)
+			       (match-beginning 0)
+			     (match-end 0))) ;; Previous search result
+	       (re-search-forward "\
+\\(<div[\t\n ]\\(?:[^\t\n >]+[\t\n ]+\\)*class=\"pager\"\\)\
+\\|\\(<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*id=\"RelatedImg\"\\)\
+\\|\\(?:[\t\n ]*<div[^>]*>[\t\n ]*<h[0-9]>[\t\n ]*PR[\t\n ]*</h[0-9]>\\)\
+\\|\\(?:[\t\n 　]*<\\(?:/div\\|/?p\\)>\\)*[\t\n 　]*<script[\t\n ]"
+				  nil t)))
+	(progn
+	  (setq end (or (and (match-beginning 2)
+			     (save-match-data
+			       (and (shimbun-end-of-tag "div")
+				    (match-end 0))))
+			(match-beginning 0)))
+	  (when (prog1
+		    (and (match-beginning 1)
+			 (shimbun-end-of-tag "div")
+			 (re-search-backward "<a[\t\n ]+[^>]+>[^<]*前のページ"
+					     end t))
+		  (delete-region end (point-max)))
+	    (goto-char start)
+	    (insert "&#012;\n")) ;; Page delimiter.
+	  (delete-region (point-min) start)
+
+	  ;; Insert a new line after every image.
+	  (goto-char (point-min))
+	  (while (re-search-forward "\\(<img[\t\n ]+[^>]+>\\)[\t\n ]*" nil t)
+	    (replace-match "\\1<br>"))
+
+	  ;; Remove useless tags.
+	  (goto-char (point-min))
+	  (while (re-search-forward "\
+\\(?:[\t\n ]*<p\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)>[\t\n ]*</p>\\)[\t\n ]*"
+				    nil t)
+	    (delete-region (match-beginning 0) (match-end 0))
+	    (when (string-equal (buffer-substring (max (point-min)
+						       (- (point) 6))
+						  (point))
+				"&#012;")
+	      (if (looking-at "<p\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)>[\t\n ]*")
+		  (replace-match "\n")
+		(insert "\n"))))
+	  (goto-char (point-min))
+	  (when (re-search-forward "\
+\\(?:[\t\n ]*</?div\\(?:[\t\n ]*\\|[\t\n ]+[^>]+\\)>\\)+[\t\n ]*\\'"
+				   nil t)
+	    (delete-region (match-beginning 0) (point-max))
+	    (insert "\n"))
+	  (goto-char (point-min))
+	  (while (re-search-forward "\
+\[\t\n ]*\\(?:<div\\(?:[\t\n ]+[^>]+\\)?>[\t\n ]*\\)+\
+<span>[\t\n ]*\\[PR\\][\t\n ]*</span>[\t\n ]*\\(?:<[^>]+>[\t\n ]*\\)*" nil t)
+	    (setq start (match-beginning 0)
+		  end (match-end 0))
+	    (goto-char start)
+	    (if (shimbun-end-of-tag "div" t)
+		(replace-match "\n")
+	      (goto-char end)
+	      (when (eobp)
+		(delete-region start end)
+		(insert "\n"))))
+	  (goto-char (point-min))
+	  (while (search-forward "<p class=\"zoom\"" nil t)
+	    (when (shimbun-end-of-tag "p" t)
+	      (delete-region (match-beginning 0) (match-end 0))))
+	  (goto-char (point-min))
+	  (when (re-search-forward "[\t\n ]*<div id=\"ad2line\"><ul><li>\\'"
+				   nil t)
+	    (delete-region (match-beginning 0) (match-end 0)))
+
+	  (shimbun-remove-orphaned-tag-strips "div\\|span")
+
+	  ;; Convert Japanese zenkaku ASCII chars into hankaku.
+	  (when (and hankaku (not (memq hankaku '(header subject))))
+	    (shimbun-japanese-hankaku-buffer t))
+
+	  ;; Break long lines.
+	  (unless (shimbun-prefer-text-plain-internal shimbun)
+	    (shimbun-break-long-japanese-lines))
+	  t)
+      (erase-buffer)
+      (insert "<html><body>\
+この記事 (またはこの次のページ) はもうありません。<br>\n\
+\(さもなければ通常とは異なる形式を使っているか、<br>\n\
+&nbsp;または取得に失敗したのかもしれません。)</body></html>\n")
+      nil)))
 
 (provide 'sb-sankei)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-savannah.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-savannah.el
--- work/emacs-w3m-1.4.4/shimbun/sb-savannah.el	2005-03-14 07:14:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-savannah.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-scipy.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-security-memo.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-security-memo.el
--- work/emacs-w3m-1.4.4/shimbun/sb-security-memo.el	2005-03-14 07:25:38.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-security-memo.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-slashdot-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-slashdot-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-slashdot-jp.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-slashdot-jp.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-slashdot-jp.el --- shimbun backend for slashdot.jp -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010
+;; NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -19,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -44,9 +45,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'shimbun)
 (require 'sb-rss)
 
@@ -74,20 +72,22 @@
 			(const :tag "Newest first (Ignore threads)" 5)))))
 
 (defcustom shimbun-slashdot-jp-group-alist
-  '(("story"	   . "http://slashdot.jp/slashdot.rdf")
-    ("askslashdot" . "http://slashdot.jp/askslashdot.rdf")
-    ("bookreview"  . "http://slashdot.jp/books.rdf")
-    ("bsd"	   . "http://slashdot.jp/bsd.rdf")
-    ("developers"  . "http://slashdot.jp/developers.rdf")
-    ("interview"   . "http://slashdot.jp/interview.rdf")
-    ("linuxkernel" . "http://slashdot.jp/linuxkernel.rdf")
-    ("mac"	   . "http://slashdot.jp/mac.rdf")
-    ("mobile"	   . "http://slashdot.jp/mobile.rdf")
-    ("science"	   . "http://slashdot.jp/science.rdf")
-    ("security"	   . "http://slashdot.jp/security.rdf")
-    ("slash"	   . "http://slashdot.jp/slash.rdf")
+  '(("story"	   . "http://slashdot.jp/index.rss")
+    ("askslashdot" . "http://slashdot.jp/askslashdot.rss")
+    ("bookreview"  . "http://slashdot.jp/books.rss")
+    ("bsd"	   . "http://slashdot.jp/bsd.rss")
+    ("developers"  . "http://slashdot.jp/developers.rss")
+    ("interview"   . "http://slashdot.jp/interview.rss")
+    ("linux"       . "http://slashdot.jp/linux.rss")
+    ("mac"	   . "http://slashdot.jp/mac.rss")
+    ("mobile"	   . "http://slashdot.jp/mobile.rss")
+    ("science"	   . "http://slashdot.jp/science.rss")
+    ("security"	   . "http://slashdot.jp/security.rss")
+    ("slash"	   . "http://slashdot.jp/slash.rss")
+    ("it"          . "http://slashdot.jp/it.rss")
+    ("hardware"    . "http://slashdot.jp/hardware.rss")
     ("diary.oliver" .
-     "http://slashdot.jp/journal.pl?op=display&uid=4&content_type=rss"))
+     "http://slashdot.jp/~Oliver/journal/rss"))
   "*Alist of slashdot groups and their RSS feeds."
   :group 'shimbun
   :type '(repeat
@@ -98,11 +98,15 @@
 (luna-define-class shimbun-slashdot-jp (shimbun-rss) ())
 
 (defvar shimbun-slashdot-jp-from-address "slashmaster@slashdot.jp")
-(defvar shimbun-slashdot-jp-coding-system 'euc-japan)
+;;(defvar shimbun-slashdot-jp-coding-system 'euc-japan)
 (defvar shimbun-slashdot-jp-content-start
-  "\n<!-- start template: ID [0-9]+, \\(dispStory;.*\\|.*page;journal;default\\) -->\n")
+  "<!-- start template: ID [0-9]+, \
+\\(dispStory;[^;]+\\|\\(bluebox\\|generic\\|greypage\\|liquid\\|slashdotjp\
+\\|yellowpage\\);journal\\);default -->\n")
 (defvar shimbun-slashdot-jp-content-end
-  "\n<!-- end template: ID [0-9]+, \\(dispStory;.*\\|.*page;journal;default\\) -->\n")
+  "<!-- end template: ID [0-9]+, \
+\\(dispStory;[^;]+\\|\\(bluebox\\|generic\\|greypage\\|liquid\\|slashdotjp\
+\\|yellowpage\\);journal\\);default -->\n")
 
 (luna-define-method shimbun-groups ((shimbun shimbun-slashdot-jp))
   (mapcar 'car shimbun-slashdot-jp-group-alist))
@@ -115,12 +119,18 @@
   ((shimbun shimbun-slashdot-jp) url date)
   (cond
    ((string-match
-     "\\`http://slashdot\\.jp/article\\.pl\\?sid=\\([/0-9]+\\)&"
-     url)
-    (concat "<" (match-string-no-properties 1 url) "@slashdot.jp>"))
-   ((string-match
-     "\\`http://slashdot\\.jp/journal\\.pl\\?op=display&uid=\\([0-9]+\\)&id=\\([0-9]+\\)"
+     "\\`http://slashdot\\.jp/\\([a-zA-Z0-9]+\\)?/?article\\.pl\\?sid=\\([/0-9]+\\)\\(&\\|\\'\\)"
      url)
+    (if (match-string-no-properties 1 url)
+	(concat "<" (match-string-no-properties 1 url)
+		"%" (match-string-no-properties 2 url) "@slashdot.jp>")
+      (concat "<" (match-string-no-properties 2 url) "@slashdot.jp>")))
+   ((or (string-match
+	 "\\`http://slashdot\\.jp/journal\\.pl\\?op=display&uid=\\([0-9]+\\)&id=\\([0-9]+\\)"
+	 url)
+	(string-match
+	 "\\`http://slashdot\\.jp/~\\([^/]+\\)/journal/\\([0-9]+\\)\\(\\?from=rss\\)?"
+	 url))
     (concat "<" (match-string-no-properties 2 url)
 	    "%" (match-string-no-properties 1 url) "@slashdot.jp>"))
    (t (error "Cannot find message-id base"))))
@@ -129,13 +139,29 @@
   ((shimbun shimbun-slashdot-jp) &optional range)
   (let ((headers (luna-call-next-method)))
     (dolist (head headers)
-      (shimbun-header-set-xref head
-			       (concat (shimbun-header-xref head)
-				       "&mode=nocomment")))
+      (let ((xref (shimbun-header-xref head)))
+	(if (not (string-match "journal" xref))
+	    ;; article
+	    (shimbun-header-set-xref head
+				     (concat xref "&mode=nocomment"))
+	  (if (string-match
+	       "\\`http://slashdot\\.jp/~\\([^/]+\\)/journal/\\([0-9]+\\)\\(\\?from=rss\\)?"
+	       xref)
+	      (shimbun-header-set-xref head
+				       (concat
+					"http://slashdot.jp/~"
+					(match-string 1 xref)
+					"/journal/"
+					(match-string 2 xref)
+					"?theme=generic&mode=nocomment"))
+	    (shimbun-header-set-xref head
+				     (concat xref
+					     "&theme=generic&mode=nocomment"))))))
+
     headers))
 
 (defun shimbun-slashdot-jp-comment-url (url)
-  (when (string-match "\\`http://slashdot\\.jp/article\\.pl\\?" url)
+  (when (string-match "\\`http://slashdot\\.jp/\\([a-zA-Z0-9]+\\)?/?article\\.pl" url)
     (mapconcat 'identity
 	       (cons (if (string-match "&mode=nocomment\\'" url)
 			 (substring url 0 (match-beginning 0))
@@ -145,10 +171,27 @@
 			     shimbun-slashdot-jp-comment-arguments))
 	       "&")))
 
+(luna-define-method shimbun-make-contents :before
+  ((shimbun shimbun-slashdot-jp) header)
+  (goto-char (point-min))
+  (if (string-match
+       "\\`http://slashdot\\.jp/\\([a-zA-Z0-9]+\\)?/?article\\.pl"
+       (shimbun-header-xref header))
+      ;; article
+      (when (re-search-forward "<table[^>]*class=\"titlebar\"[^>]*>[ \t\n]*\
+<tr[^>]*>[ \t\n]*<td[^>]*>[ \t\n]*<font[^>]*>\\([^<]+\\)</font>" nil t)
+	(shimbun-header-set-subject header (match-string-no-properties 1)))
+    ;; journal
+    (when (re-search-forward
+	   "<a +href=\"?/?[^/]*/journal/[0-9]+\"?>\\([^<]+\\)</a>" nil t)
+      (shimbun-header-set-subject header (match-string-no-properties 1))))
+  (goto-char (point-min)))
+
 (luna-define-method shimbun-clear-contents :around
   ((shimbun shimbun-slashdot-jp) header)
   (when (luna-call-next-method)
     (shimbun-remove-tags "<!-- begin ad code -->" "<!-- end ad code -->")
+    (shimbun-remove-tags "script\\|noscript" t)
     (let ((url (shimbun-slashdot-jp-comment-url (shimbun-header-xref header))))
       (when url
 	(goto-char (point-max))
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-slashdot.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-sml.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sml.el
--- work/emacs-w3m-1.4.4/shimbun/sb-sml.el	2005-03-14 07:14:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sml.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-sourceforge-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sourceforge-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-sourceforge-jp.el	2005-03-22 06:50:44.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sourceforge-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-sourceforge-jp.el --- shimbun backend for lists.sourceforge.jp
 
-;; Copyright (C) 2003, 2004, 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2003, 2004, 2005, 2007
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -41,8 +42,8 @@
     ("iiimf-skk-users-en" . "iiimf-skk-users.en")
     ("iiimf-skk-cvs-commit" . "iiimf-skk-cvs-commit")
     ("macemacsjp-users")
-    ("macemacsjp-dev")
-    ("macemacsjp-english"))
+    ("macemacsjp-english")
+    ("ntemacsjp-users"))
   "*List of mailing lists serverd by SourceForge-JP."
   :group 'shimbun
   :type '(repeat
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-spiegel.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-spiegel.el
--- work/emacs-w3m-1.4.4/shimbun/sb-spiegel.el	2004-05-10 07:45:11.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-spiegel.el	2008-02-24 20:00:13.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-spiegel.el --- spiegel online shimbun backend
 
-;; Copyright (C) 2004 David Hansen
+;; Copyright (C) 2004, 2006, 2008 David Hansen
 
 ;; Author: David Hansen <david.hansen@physik.fu-berlin.de>
 ;; Keywords: news
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -35,9 +35,12 @@
   "http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml")
 (defvar shimbun-spiegel-groups '("news"))
 (defvar shimbun-spiegel-from-address  "spiegel_online@spiegel.de")
-(defvar shimbun-spiegel-content-start "<p>")
-(defvar shimbun-spiegel-content-end
-  "\\(<hr size=\"1\" noshade>\\|<div align=right>\\)")
+(defvar shimbun-spiegel-content-start "<div id=\"spMainContent\">")
+(defvar shimbun-spiegel-content-end "<div class=\"spArticleCredit\">")
+(defvar shimbun-spiegel-x-face-alist
+  '(("default" . "X-Face: \"F#SZ#pUmtu/<qtxz=G'w#244Hp7}y|vSO?j@i?6g-uGJ2&a/g#\
+U96H{_VK#k&,3O\"L)6;Z823T4;}r1R,rLedLu2hQ%biKv(LR@VJXA6XRJ`0xk!I'k!c<uH6R!.+}S\
+l1}uY-+WD)So~O]jsKT@}|?Z%!fVwHBde3rd5WLW^^I]UM*z>/K|u59;;-")))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-spiegel))
   shimbun-spiegel-url)
@@ -53,16 +56,6 @@
      header)
    (luna-call-next-method)))
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-spiegel) url date)
-  (unless (string-match "[0-9,]+\\.html" url)
-    (error "Cannot find message-id base"))
-  (concat "<"
-	  (shimbun-replace-in-string (match-string 0 url)
-				     "\\(,\\|druck-\\|\\.html\\)"
-				     "")
-	  "@spiegel.de>"))
-
 (provide 'sb-spiegel)
 
 ;;; sb-spiegel.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-sponichi.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sponichi.el
--- work/emacs-w3m-1.4.4/shimbun/sb-sponichi.el	2005-03-14 07:31:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-sponichi.el	2007-10-17 20:15:58.000000000 +0900
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-squeak-dev.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-squeak-dev.el
--- work/emacs-w3m-1.4.4/shimbun/sb-squeak-dev.el	2005-03-14 07:14:41.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-squeak-dev.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,17 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
 (require 'sb-mailman)
 (require 'sendmail)
@@ -58,4 +55,5 @@
   (buffer-string))
 
 (provide 'sb-squeak-dev)
+
 ;;; sb-squeak-dev.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-squeak-ja.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-squeak-ja.el
--- work/emacs-w3m-1.4.4/shimbun/sb-squeak-ja.el	2005-03-14 07:14:40.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-squeak-ja.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,17 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 'shimbun)
 (require 'sb-mailman)
 
@@ -40,4 +37,5 @@
 (defvar shimbun-squeak-ja-groups '("main"))
 
 (provide 'sb-squeak-ja)
+
 ;;; sb-squeak-ja.el ends here
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-sueddeutsche-de.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-tcup.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tcup.el
--- work/emacs-w3m-1.4.4/shimbun/sb-tcup.el	2005-03-17 10:26:03.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tcup.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-tdiary-ml.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tdiary-ml.el
--- work/emacs-w3m-1.4.4/shimbun/sb-tdiary-ml.el	2003-07-11 09:09:13.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tdiary-ml.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-tdiary-ml.el --- shimbun backend for www.tDiary.org
 
-;; Copyright (C) 2003 Koichiro Ohba  <koichiro@meadowy.org>
+;; Copyright (C) 2003, 2007 Koichiro Ohba  <koichiro@meadowy.org>
 
 ;; Author: Koichiro Ohba  <koichiro@meadowy.org>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -45,11 +45,11 @@
   "<strong><a name=\"\\([0-9]+\\)\" href=\"\\(msg[0-9]+.html\\)\">\\([^<]+\\)</a></strong>,\n      <em>\\([^<]+\\)</em>")
 
 (defmacro shimbun-tdiary-ml-concat-url (shimbun url)
-  (` (concat (shimbun-url-internal (, shimbun))
-	     (nth 1 (assoc (shimbun-current-group-internal (, shimbun))
-			   shimbun-tdiary-ml-group-path-alist))
-	     "/"
-	     (, url))))
+  `(concat (shimbun-url-internal ,shimbun)
+	   (nth 1 (assoc (shimbun-current-group-internal ,shimbun)
+			 shimbun-tdiary-ml-group-path-alist))
+	   "/"
+	   ,url))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-tdiary-ml))
   (shimbun-tdiary-ml-concat-url shimbun "index.html"))
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-tdiary.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tdiary.el
--- work/emacs-w3m-1.4.4/shimbun/sb-tdiary.el	2005-03-14 07:31:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tdiary.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-tdiary.el --- shimbun backend for tDiary
 
-;; Copyright (C) 2003, 2004 OHASHI Akira <bg66@koka-in.org>
+;; Copyright (C) 2003, 2004, 2005, 2007 OHASHI Akira <bg66@koka-in.org>
 
 ;; Author: OHASHI Akira <bg66@koka-in.org>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -30,9 +30,8 @@
   (require 'cl))
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-tdiary (shimbun shimbun-text) ())
+(luna-define-class shimbun-tdiary (shimbun) ())
 
 (defvar shimbun-tdiary-content-start "<h3")
 (defvar shimbun-tdiary-content-end "</div>")
@@ -55,48 +54,48 @@
 	       shimbun-tdiary-group-alist)))
 
 (defmacro shimbun-tdiary-get-headers (shimbun url headers &optional aux)
-  (` (let ((case-fold-search t))
-       (goto-char (point-max))
-       (while (re-search-backward "<h3[^>]*><a href=\"\./\\(.*\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\\([0-9][0-9]\\).*#\\(p[0-9]+\\)\\)\"> *\\(<span class=\"[ps]anchor\">.+</span>\\)?[^<]*</a>\\(.+]\\|\\) *\\(.+\\)</h3>" nil t)
-	 (let ((url (match-string 1))
-	       (year (match-string 2))
-	       (month (match-string 3))
-	       (day (match-string 4))
-	       (topic (match-string 5))
-	       (subject (match-string 8))
-	       date id)
-	   (setq date (shimbun-make-date-string (string-to-number year)
-						(string-to-number month)
-						(string-to-number day)))
-	   (setq id (format "<%s.%s%s%s.%s@tdiary.org>"
-			    topic year month day
-			    (eword-encode-string
-			     (shimbun-current-group-internal (, shimbun)))))
-	   (push (shimbun-create-header
-		  0 subject (or (, aux) (shimbun-from-address (, shimbun)))
-		  date id "" 0 0 (concat (shimbun-index-url (, shimbun)) url))
-		 (, headers))))
-       (, headers))))
+  `(let ((case-fold-search t))
+     (goto-char (point-max))
+     (while (re-search-backward "<h3[^>]*><a href=\"\./\\(.*\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\\([0-9][0-9]\\).*#\\(p[0-9]+\\)\\)\"> *\\(<span class=\"[ps]anchor\">.+</span>\\)?[^<]*</a>\\(.+]\\|\\) *\\(.+\\)</h3>" nil t)
+       (let ((url (match-string 1))
+	     (year (match-string 2))
+	     (month (match-string 3))
+	     (day (match-string 4))
+	     (topic (match-string 5))
+	     (subject (match-string 8))
+	     date id)
+	 (setq date (shimbun-make-date-string (string-to-number year)
+					      (string-to-number month)
+					      (string-to-number day)))
+	 (setq id (format "<%s.%s%s%s.%s@tdiary.org>"
+			  topic year month day
+			  (eword-encode-string
+			   (shimbun-current-group-internal ,shimbun))))
+	 (push (shimbun-create-header
+		0 subject (or ,aux (shimbun-from-address ,shimbun))
+		date id "" 0 0 (concat (shimbun-index-url ,shimbun) url))
+	       ,headers)))
+     ,headers))
 
 (defmacro shimbun-tdiary-make-date (count first)
-  (` (let* ((today (current-time))
-	    (month (nth 4 (decode-time today)))
-	    (year (nth 5 (decode-time today)))
-	    (dow (nth 6 (decode-time today)))
-	    (dst (nth 7 (decode-time today)))
-	    (zone (nth 8 (decode-time today))))
-       (dotimes (i (1- (, count)))
-	 (decf month)
-	 (when (<= month 0)
-	   (setq month 12)
-	   (decf year)))
-       (let ((date
-	      (format-time-string
-	       "%Y%m"
-	       (encode-time 0 0 0 1 month year dow dst zone))))
-	 (if (string< date (, first))
-	     nil
-	   date)))))
+  `(let* ((today (current-time))
+	  (month (nth 4 (decode-time today)))
+	  (year (nth 5 (decode-time today)))
+	  (dow (nth 6 (decode-time today)))
+	  (dst (nth 7 (decode-time today)))
+	  (zone (nth 8 (decode-time today))))
+     (dotimes (i (1- ,count))
+       (decf month)
+       (when (<= month 0)
+	 (setq month 12)
+	 (decf year)))
+     (let ((date
+	    (format-time-string
+	     "%Y%m"
+	     (encode-time 0 0 0 1 month year dow dst zone))))
+       (if (string< date ,first)
+	   nil
+	 date))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-tdiary)
 					 &optional range)
@@ -139,17 +138,16 @@
 					   header)
   (let ((case-fold-search t)
 	(id (shimbun-header-id header))
-	start footnotes)
+	(start (shimbun-content-start shimbun))
+	footnotes)
     (when (string-match "\\(p[0-9]+\\)\." id)
       (setq id (substring id (match-beginning 1) (match-end 1)))
       (re-search-forward (concat "<a name=\"" id) nil t)
-      (and (search-backward shimbun-tdiary-content-start nil t)
+      (and (search-backward start nil t)
 	   (goto-char (match-beginning 0))))
-    (when (and (re-search-forward (shimbun-content-start-internal shimbun)
-				  nil t)
+    (when (and (re-search-forward start nil t)
 	       (setq start (match-beginning 0))
-	       (re-search-forward (shimbun-content-end-internal shimbun)
-				  nil t))
+	       (re-search-forward (shimbun-content-end shimbun) nil t))
       (delete-region (match-beginning 0) (point-max))
       (delete-region (point-min) start))
     (goto-char (point-min))
@@ -161,7 +159,7 @@
     (when footnotes
       (goto-char (point-max))
       (insert "<br><br>\n")
-      (mapcar 'insert (nreverse footnotes)))
+      (mapc 'insert (nreverse footnotes)))
     (shimbun-header-insert-and-buffer-string shimbun header nil t)))
 
 (provide 'sb-tdiary)
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-tech-on.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-texfaq.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-texfaq.el
--- work/emacs-w3m-1.4.4/shimbun/sb-texfaq.el	2005-03-14 07:25:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-texfaq.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-text.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-text.el
--- work/emacs-w3m-1.4.4/shimbun/sb-text.el	2005-03-14 07:25:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-text.el	2009-05-21 08:13:31.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-text.el -- shimbun backend class for text content -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009
+;; Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -49,31 +50,35 @@
   (let ((top (point)) chr)
     (while (if (>= (move-to-column shimbun-fill-column)
 		   shimbun-fill-column)
-	       (not (progn
-		      (if (memq (preceding-char) shimbun-kinsoku-eol-list)
-			  (progn
-			    (backward-char)
-			    (while (memq (preceding-char) shimbun-kinsoku-eol-list)
-			      (backward-char))
-			    (insert "\n"))
-			(while (memq (setq chr (following-char)) shimbun-kinsoku-bol-list)
-			  (forward-char))
-			(if (looking-at "\\s-+")
-			    (or (eolp) (delete-region (point) (match-end 0)))
-			  (or (> (char-width chr) 1)
-			      (re-search-backward "\\<" top t)
-			      (end-of-line)))
-			(or (eolp) (insert "\n"))))))
+	       (if (memq (char-before) shimbun-kinsoku-eol-list)
+		   (prog1
+		       t
+		     (backward-char)
+		     (while (memq (char-before) shimbun-kinsoku-eol-list)
+		       (backward-char))
+		     (insert "\n"))
+		 (while (memq (setq chr (char-after)) shimbun-kinsoku-bol-list)
+		   (forward-char))
+		 (if (looking-at "\\s-+")
+		     (or (eolp) (delete-region (point) (match-end 0)))
+		   (or (not chr)
+		       (> (char-width chr) 1)
+		       (re-search-backward "\\<" top t)
+		       (end-of-line)))
+		 (if (eolp)
+		     nil
+		   (insert "\n")
+		   t)))
       (setq top (point))))
   (forward-line 1)
   (not (eobp)))
 
-(defsubst shimbun-shallow-rendering ()
+(defun shimbun-shallow-rendering ()
   (goto-char (point-min))
   (while (search-forward "<p>" nil t)
     (insert "\n\n"))
   (goto-char (point-min))
-  (while (search-forward "<br>" nil t)
+  (while (re-search-forward "<br\\(:? /\\)?>" nil t)
     (insert "\n"))
   (shimbun-remove-markup)
   (shimbun-decode-entities)
@@ -82,17 +87,14 @@
   (goto-char (point-min))
   (when (skip-chars-forward "\n")
     (delete-region (point-min) (point)))
-  (while (search-forward "\n\n" nil t)
-    (let ((p (point)))
-      (when (skip-chars-forward "\n")
-	(delete-region p (point)))))
+  (while (re-search-forward "\n\n\n+" nil t)
+    (replace-match "\n\n"))
   (goto-char (point-max))
   (when (skip-chars-backward "\n")
     (delete-region (point) (point-max)))
   (insert "\n"))
 
-(luna-define-method shimbun-make-contents ((shimbun shimbun-text)
-					   header)
+(defun shimbun-make-text-contents (shimbun header)
   (shimbun-header-insert-and-buffer-string
    shimbun header nil
    ;; When cleaning has been succeeded, this article is treated as a
@@ -102,6 +104,10 @@
        (shimbun-shallow-rendering)
      t)))
 
+(luna-define-method shimbun-make-contents ((shimbun shimbun-text)
+					   header)
+  (shimbun-make-text-contents shimbun header))
+
 (provide 'sb-text)
 
 ;;; sb-text.el ends here
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-the-onion.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-the-register.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-the-register.el
--- work/emacs-w3m-1.4.4/shimbun/sb-the-register.el	2005-01-25 21:17:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-the-register.el	2008-07-01 10:04:35.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-the-register.el --- The Register shimbun backend
 
-;; Copyright (C) 2004, 2005 David Hansen
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008 David Hansen
 
 ;; Author: David Hansen <david.hansen@physik.fu-berlin.de>
 ;; Keywords: news
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -34,7 +34,12 @@
 (defvar shimbun-the-register-url "http://www.theregister.co.uk/")
 (defvar shimbun-the-register-from-address  "invalid@theregister.co.uk")
 (defvar shimbun-the-register-content-start "<h2>")
-(defvar shimbun-the-register-content-end "<p class=\"Furniture\">")
+(defvar shimbun-the-register-content-end
+  "<p class=\"Furniture\">\\|<p id=\"Copyright\">")
+(defvar shimbun-the-register-x-face-alist
+  '(("default" . "X-Face: 'r-3ZQiX|_[TrM[|LF34{X#MX`MHFuL$_2w4Cs\"ET_jx9/JsL)k\
+xvY~i(,cv8ho2=\\L!Tz# @=+.N^%}G<@JRS<ZeD90JN/,oDx.o:\\-kBeyKN%DzZ)s|Ck69P6WY6^\
+IPf~GT+xfvp:1-BRTK7'f&\"\"mr'CflD?Q2R%IkV>")))
 
 (defvar shimbun-the-register-path-alist
   '(("news" . "headlines.rss")
@@ -60,16 +65,8 @@
   ((shimbun shimbun-the-register) &optional range)
   (mapcar
    (lambda (header)
-     ;; we will get redirected from http://go.theregister.com/feed/... to
-     ;; http://www.theregister.co.uk/...
-     ;; if we don't set the URL right shimbun can't follow the <img src=
-     (let ((url (shimbun-header-xref header)))
-       (setq url (w3m-replace-in-string
-		  url
-		  "http://go\\.theregister\\.com/feed/"
-		  "http://www.theregister.co.uk/"))
-       (shimbun-header-set-xref
-	header (concat url "print.html")))
+     (shimbun-header-set-xref
+      header (concat (shimbun-header-xref header) "print.html"))
      header)
    (luna-call-next-method)))
 
@@ -77,22 +74,15 @@
   :before ((shimbun shimbun-the-register) header)
   (save-excursion
     ;; remove annoying stuff
-    (let ((junk '(("(<span class=\"URL\">" . "</span>)")
-		  ("<div class=\"Ad\">" . "</div>"))))
-      (while junk
-	(goto-char (point-min))
-	(let ((beg-str (caar junk)) (end-str (cdar junk)) beg end)
-	  (setq junk (cdr junk))
-	  (while (search-forward beg-str nil t)
-	    (setq beg (match-beginning 0))
-	    (when (setq end (search-forward end-str nil t))
-	      (delete-region beg end))))))))
-
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-the-register) url date)
-  (unless (string-match "http://[^/]+/\\(.+\\)\\(/*print\\.html\\)?" url)
-    (error "Cannot find message-id base"))
-  (concat "<" (match-string 1 url) "@the-register.co.uk>"))
+    (dolist (junk '(("(?<span class=\"URL\">" . "</span>)?")
+                    ("<div \\(class\\|id\\)=\"[^\"]*Ad\"" . "</div>")
+                    ("<a href=\"http://ad\\." . "</a>")))
+      (goto-char (point-min))
+      (message "%s" (car junk))
+      (while (re-search-forward (car junk) nil t)
+        (let ((beg (match-beginning 0)))
+          (when (re-search-forward (cdr junk) nil t)
+            (delete-region beg (point))))))))
 
 (provide 'sb-the-register)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-tigris.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tigris.el
--- work/emacs-w3m-1.4.4/shimbun/sb-tigris.el	2005-02-15 20:04:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-tigris.el	2009-05-21 08:13:31.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-tigris.el --- shimbun backend for tigris.org ML
 
-;; Copyright (C) 2005 Tsuyoshi CHO <mfalcon_sky@emailuser.net>
+;; Copyright (C) 2005, 2007, 2009 Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
-;; Author: Tsuyoshi CHO <mfalcon_sky@emailuser.net>
+;; Author: Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
@@ -96,7 +96,7 @@
 	   (shimbun-tigris-get-ml-name shimbun)
 	   )))
 
-(defsubst shimbun-tigris-remove-amp (url)
+(defun shimbun-tigris-remove-amp (url)
   "Remove URL &amp; -> &"
   (save-match-data
     (while (string-match "&amp;" url)
@@ -141,7 +141,7 @@
 		     (count 0)
 		     id)
 		(when (string-match ".*msgNo=\\([0-9]+\\).*" url)
-		  (setq count (string-to-int (match-string 1 url))))
+		  (setq count (string-to-number (match-string 1 url))))
 		(setq id (format "<%d%%%s.%s.%s>"
 				 count
 				 (shimbun-tigris-get-ml-name shimbun)
@@ -151,9 +151,9 @@
 		(if (and (stringp date)
 			 (string-match "\\([0-9]*\\)-\\([0-9]*\\)-\\([0-9]*\\)" date))
 		    (setq date (shimbun-make-date-string
-				(string-to-int (match-string 1 date))
-				(string-to-int (match-string 2 date))
-				(string-to-int (match-string 3 date))))
+				(string-to-number (match-string 1 date))
+				(string-to-number (match-string 2 date))
+				(string-to-number (match-string 3 date))))
 		  (setq date nil))
 		;; change to raw page
 		(setq url (shimbun-expand-url
@@ -174,12 +174,12 @@
 	(beg nil)
 	(end nil))
     (when (search-forward "<PRE>")
-      (next-line 1)
+      (forward-line 1)
       (beginning-of-line)
       (setq beg (point))
       (delete-region (point-min) beg))
     (when (search-forward "</PRE>")
-      (previous-line 1)
+      (forward-line -1)
       (end-of-line)
       (setq end (point))
       (delete-region end (point-max)))
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-toshiba.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-toshiba.el
--- work/emacs-w3m-1.4.4/shimbun/sb-toshiba.el	2005-03-14 07:14:40.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-toshiba.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-vinelinux.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-vinelinux.el
--- work/emacs-w3m-1.4.4/shimbun/sb-vinelinux.el	2004-09-01 13:12:27.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-vinelinux.el	2009-05-21 08:13:31.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-vinelinux.el --- shimbun backend class for vinelinux web site. -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009
+;; NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -32,7 +33,9 @@
 
 (defconst shimbun-vinelinux-url "http://www.vinelinux.org")
 (defconst shimbun-vinelinux-group-path-alist
-  '(("errata.3x.i386" . "errata/3x/i386.html")
+  '(("errata.4x.i386" . "errata/4x/i386.html")
+    ("errata.4x.ppc" . "errata/4x/ppc.html")
+    ("errata.3x.i386" . "errata/3x/i386.html")
     ("errata.3x.ppc" . "errata/3x/ppc.html")
     ("errata.3x.alpha" . "errata/3x/alpha.html")
     ("errata.25x.i386" . "errata/25x/i386.html")
@@ -49,7 +52,7 @@
   (mapcar 'car shimbun-vinelinux-group-path-alist))
 (defconst shimbun-vinelinux-from-address "webmaster@www.vinelinux.org")
 
-(defsubst shimbun-vinelinux-parse-time (str)
+(defun shimbun-vinelinux-parse-time (str)
   (shimbun-make-date-string
    (string-to-number (substring str 0 4))
    (string-to-number (substring str 4 6))
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-w3m-dev.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-w3m-dev.el
--- work/emacs-w3m-1.4.4/shimbun/sb-w3m-dev.el	2005-01-14 18:07:15.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-w3m-dev.el	2007-10-17 20:15:58.000000000 +0900
@@ -4,7 +4,7 @@
 ;; Copyright (C) 2005 Tsuyoshi CHO
 
 ;; Authors: NAKAJIMA Mikio <minakaji@namazu.org>,
-;;          Tsuyoshi CHO <mfalcon_sky@emailuser.net>
+;;          Tsuyoshi CHO   <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -20,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
Only in work/emacs-w3m-1.4.4/shimbun: sb-weeklyworldnews.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-welt-de.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-welt-de.el
--- work/emacs-w3m-1.4.4/shimbun/sb-welt-de.el	2004-06-18 19:26:46.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-welt-de.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-welt-de.el --- shimbun backend for <http://www.welt.de>
 
-;; Copyright (C) 2004 Andreas Seltenreich <seltenreich@gmx.de>
+;; Copyright (C) 2004, 2005, 2006, 2010
+;; Andreas Seltenreich <seltenreich@gmx.de>
 
 ;; Author: Andreas Seltenreich <seltenreich@gmx.de>
 ;; Keywords: news, shimbun
@@ -17,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -43,12 +44,6 @@
 (luna-define-method shimbun-groups ((shimbun shimbun-welt-de))
   shimbun-welt-de-groups)
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-welt-de) url date)
-  (unless (string-match "\\?nid=\\([0-9]+\\)" url)
-    (error "Cannot find message-id"))
-  (format "<%s@www.welt.de>" (match-string 1 url)))
-
 ;; Kill Javascript
 (luna-define-method shimbun-clear-contents
   :before ((shimbun shimbun-welt-de) headers)
@@ -60,11 +55,11 @@
 	 "<img src=\"\\([^\"]+?\\)_thumbnail.jpg" nil t)
 	(setq javascript-image (match-string-no-properties 1)))
 
-    (shimbun-remove-tags "<table" "</table>")
+    (shimbun-remove-tags "table" t)
 
     (when javascript-image
       (goto-char (point-min))
-      (re-search-forward shimbun-welt-de-content-start)
+      (re-search-forward (shimbun-content-start shimbun))
       (insert (concat "<img src=\"" javascript-image
 		      "_onlineBild.jpg\">")))))
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-wiki.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wiki.el
--- work/emacs-w3m-1.4.4/shimbun/sb-wiki.el	2005-03-14 07:31:25.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wiki.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-wiki.el --- shimbun backend for wiki
 
-;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <minakaji@namazu.org>
+;; Copyright (C) 2003, 2004, 2006 NAKAJIMA Mikio <minakaji@namazu.org>
 
 ;; Author: NAKAJIMA Mikio <minakaji@namazu.org>
 ;; Keywords: news
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 program currently supports PukiWiki and Hiki.
@@ -112,9 +112,9 @@
   (cadr (assoc (shimbun-current-group-internal shimbun)
 	       shimbun-wiki-group-alist)))
 
-(luna-define-method shimbun-make-contents ((shimbun shimbun-wiki) header)
+(luna-define-method shimbun-clear-contents ((shimbun shimbun-wiki) header)
   (let* ((case-fold-search t)
-	 (alist (assoc (shimbun-current-group-internal shimbun)
+	 (alist (assoc (shimbun-current-group shimbun)
 		       shimbun-wiki-group-alist))
 	 (cstart (nth 4 alist))
 	 (cend (nth 5 alist))
@@ -125,14 +125,7 @@
 	       (re-search-forward cend nil t))
       (delete-region (match-beginning 0) (point-max))
       (delete-region (point-min) start)
-      (goto-char (point-min))
-      (insert "<html>\n<head>\n<base href=\""
-	      (shimbun-header-xref header) "\">\n</head>\n<body>\n")
-      (goto-char (point-max))
-      (insert (shimbun-footer shimbun header t)
-	      "\n</body>\n</html>\n"))
-    (shimbun-make-mime-article shimbun header)
-    (buffer-string)))
+      t)))
 
 (provide 'sb-wiki)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-wikimedia.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wikimedia.el
--- work/emacs-w3m-1.4.4/shimbun/sb-wikimedia.el	2005-03-09 18:00:45.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wikimedia.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-wikimedia.el --- shimbun backend for Wikimedia Mailing list -*- coding: utf-8; -*-
 
-;; Copyright (C) 2004, 2005 Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Copyright (C) 2004, 2005, 2007 Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
-;; Author: Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Author: Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; See also
 ;;; URL <http://mail.wikipedia.org/>
@@ -81,11 +81,11 @@
 (defvar shimbun-wikimedia-groups (mapcar 'car shimbun-wikimedia-group-path-alist))
 
 (defmacro shimbun-wikimedia-concat-url (shimbun url)
-  (` (concat (shimbun-url-internal (, shimbun))
-	     (nth 1 (assoc (shimbun-current-group-internal (, shimbun))
-			   shimbun-wikimedia-group-path-alist))
-	     "/"
-	     (, url))))
+  `(concat (shimbun-url-internal ,shimbun)
+	   (nth 1 (assoc (shimbun-current-group-internal ,shimbun)
+			 shimbun-wikimedia-group-path-alist))
+	   "/"
+	   ,url))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-wikimedia))
   (shimbun-expand-url
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-wincefan.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wincefan.el
--- work/emacs-w3m-1.4.4/shimbun/sb-wincefan.el	2005-03-14 07:14:40.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wincefan.el	2007-10-17 20:15:58.000000000 +0900
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-wired-jp.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wired-jp.el
--- work/emacs-w3m-1.4.4/shimbun/sb-wired-jp.el	2005-02-24 06:51:10.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-wired-jp.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-wired-jp.el --- shimbun backend for Hotwired Japan -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2005, 2006 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: news
@@ -18,17 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
 (require 'shimbun)
 (require 'sb-rss)
-(require 'md5)
-(eval-when-compile
-  (require 'cl))
 
 (luna-define-class shimbun-wired-jp (shimbun-rss shimbun) ())
 
@@ -71,14 +68,6 @@
 		     shimbun-wired-jp-group-table)))
     (or (nth 1 elem) (nth 2 elem))))
 
-(defsubst shimbun-wired-jp-build-message-id (shimbun url)
-  (concat "<" (md5 url) "%" (shimbun-current-group shimbun)
-	  "@hotwired.goo.ne.jp>"))
-
-(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-wired-jp)
-						  url date)
-  (shimbun-wired-jp-build-message-id shimbun url))
-
 (luna-define-method shimbun-headers :around ((shimbun shimbun-wired-jp)
 					     &optional range)
   (if (nth 1 (assoc (shimbun-current-group shimbun)
@@ -101,15 +90,15 @@
 	       (buffer-substring (point)
 				 (if (search-forward "</a>" nil t)
 				     (match-beginning 0)
-				   (line-end-position)))
+				   (point-at-eol)))
 	       (format "%s (%s)"
 		       (shimbun-server-name shimbun)
 		       (shimbun-current-group shimbun))
 	       ""
-	       (shimbun-wired-jp-build-message-id shimbun url)
+	       (shimbun-rss-build-message-id shimbun url)
 	       "" 0 0 url)
 	      headers)))
-    (nreverse headers)))
+    headers))
 
 (luna-define-method shimbun-article-url ((shimbun shimbun-wired-jp) header)
   (let ((url (shimbun-article-base-url shimbun header)))
Only in work/emacs-w3m-1.4.4/shimbun: sb-wired.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-x51.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-x51.el
--- work/emacs-w3m-1.4.4/shimbun/sb-x51.el	2005-02-11 02:00:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-x51.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,8 +1,8 @@
 ;;; sb-x51.el --- shimbun backend for x51.org -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2004, 2005 Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Copyright (C) 2004, 2005, 2006, 2010 Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 
-;; Author: Tsuyoshi CHO <mfalcon21@hotmail.com>
+;; Author: Tsuyoshi CHO <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: news blog
 ;; Created: Feb 21, 2004
 
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -33,41 +33,40 @@
 
 (luna-define-class shimbun-x51 (shimbun-rss) ())
 
-(defvar shimbun-x51-url "http://x51.org/")
 (defvar shimbun-x51-group-alist
-  '(("top"        . "index.rdf") ;; Top-RDF
-    ("art"        . "x/art.php")
-    ("auction"    . "x/auction.php")
-    ("blow"       . "x/blow.php")
-    ("cabal"      . "x/cabal.php")
-    ("crime"      . "x/crime.php")
-    ("disaster"   . "x/disaster.php")
-    ("edge"       . "x/edge.php")
-    ("homme"      . "x/homme.php")
-    ("info"       . "x/info.php")
-    ("life"       . "x/life.php")
-    ("love"       . "x/love.php")
-    ("media"      . "x/media.php")
-    ("medical"    . "x/medical.php")
-    ("military"   . "x/military.php")
-    ("news"       . "x/news.php")
-    ("northkorea" . "x/northkorea.php")
-    ("oparts"     . "x/oparts.php")
-    ("phallic"    . "x/phallic.php")
-    ("psychic"    . "x/psychic.php")
-    ("religion"   . "x/religion.php")
-    ("science"    . "x/science.php")
-    ("story"      . "x/story.php")
-    ("ufo"        . "x/ufo.php")
-    ("uma"        . "x/uma.php")
-    ("xfiles"     . "x/xfiles.php")))
+  '(("top"        . "http://x51.org/index.rdf") ;; Top-RDF
+    ("anima"      . "http://anima.x51.org/index.rdf")
+    ("enema"      . "http://enema.x51.org/index.rdf")
+    ("art"        . "http://x51.org/x/art/")
+    ("blow"       . "http://x51.org/x/blow/")
+    ("crime"      . "http://x51.org/x/crime/")
+    ("disaster"   . "http://x51.org/x/disaster/")
+    ("edge"       . "http://x51.org/x/edge/")
+    ("ghost"      . "http://x51.org/x/ghost/")
+    ("info"       . "http://x51.org/x/info/")
+    ("life"       . "http://x51.org/x/life/")
+    ("love"       . "http://x51.org/x/love/")
+    ("media"      . "http://x51.org/x/media/")
+    ("medical"    . "http://x51.org/x/medical/")
+    ("oparts"     . "http://x51.org/x/oparts/")
+    ("phallic"    . "http://x51.org/x/phallic/")
+    ("psychic"    . "http://x51.org/x/psychic/")
+    ("religion"   . "http://x51.org/x/religion/")
+    ("science"    . "http://x51.org/x/science/")
+    ("ufo"        . "http://x51.org/x/ufo/")
+    ("uma"        . "http://x51.org/x/uma/")
+    ("xfiles"     . "http://x51.org/x/xfiles/")))
+
+(defvar shimbun-x51-obsolete-groups
+  '("auction" "cabal" "homme" "military" "news" "northkorea" "story")
+  "Obsolete group names.")
 
 (defvar shimbun-x51-server-name "x51.org")
 (defvar shimbun-x51-from-address "webmaster@x51.org")
 (defvar shimbun-x51-auther "X51")
 (defvar shimbun-x51-coding-system 'utf-8)
-(defvar shimbun-x51-content-start "<!-- Article -->")
-(defvar shimbun-x51-content-end "<!---/ Article --->")
+(defvar shimbun-x51-content-start "<!-- Article -->\\|<div class=\"blogbody\">")
+(defvar shimbun-x51-content-end "<!---/ Article --->\\|<div class=\"comments-body\">")
 
 ;; X-Face create from banner
 (defvar shimbun-x51-x-face-alist
@@ -75,42 +74,36 @@
 !dzRSN]tO68A5{`1RzK`g+0Yo$0q2RFM\n 7m?9-o[R6ou-[9X$JI1HYc>A-a[+DGgI")))
 
 (luna-define-method shimbun-groups ((shimbun shimbun-x51))
-  (mapcar 'car shimbun-x51-group-alist))
+  (append
+   shimbun-x51-obsolete-groups
+   (mapcar 'car shimbun-x51-group-alist)))
 
 (defmacro shimbun-x51-concat-url (shimbun url)
-  `(concat (shimbun-url-internal ,shimbun)
-	   (cdr (assoc (shimbun-current-group-internal ,shimbun)
+  `(concat (cdr (assoc (shimbun-current-group-internal ,shimbun)
 		       shimbun-x51-group-alist))
 	   ,url))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-x51))
   (shimbun-x51-concat-url shimbun ""))
 
-(luna-define-method shimbun-rss-build-message-id ((shimbun shimbun-x51)
-						  url date)
-  (unless (string-match
-	   "http://[^\/]+/x/\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\).php"
-	   url)
-    (error "Cannot find message-id base"))
-  (format "<%s%s%s@x51.org>"
-	  (match-string-no-properties 1 url)
-	  (match-string-no-properties 2 url)
-	  (match-string-no-properties 3 url)))
-
 (luna-define-method shimbun-get-headers :around ((shimbun shimbun-x51)
 						 &optional range)
   (let* ((case-fold-search t)
 	 (url (shimbun-index-url shimbun))
 	 headers)
-    (if (string-match "top" (car (assoc (shimbun-current-group-internal
-					 shimbun)
-					shimbun-x51-group-alist)))
-	(luna-call-next-method)	;; call parent method
+    (cond
+     ((member (shimbun-current-group-internal shimbun)
+	      shimbun-x51-obsolete-groups)
+      (setq headers '()))
+     ((member (shimbun-current-group-internal shimbun)
+	      '("top" "anima" "enema"))
+      (setq headers (luna-call-next-method)))	;; call parent method
+     (t
       (let* ((pages (shimbun-header-index-pages range))
 	     (beg (point-min))
 	     (end (point-max))
 	     indexes)
-	(push (concat url "?page=1") indexes) ;; push page 1
+	(push (concat url "index.php?page=1") indexes) ;; push page 1
 	(when (if pages (< 1 pages) t)
 	  (goto-char (point-min))
 	  (when (search-forward "<div class=\"middlebar\">" nil t)
@@ -147,23 +140,16 @@
 	      (goto-char (point-min))
 	      (let (title url date id)
 		(while (re-search-forward
-			"<a +href=\"http://x51\\.org/x/\
-\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([0-9][0-9]\\)\\([0-9][0-9]\\)\\.php\"\
+			"<a +href=\"\\(http://x51\\.org/x/\
+\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([0-9][0-9]\\)\\([0-9][0-9]\\)\\.php\\)\"\
  +class=\"title[^\"]*\">\\([^<]*\\)</a>"
 			nil t)
-		  (setq url (shimbun-expand-url
-			     (concat
-			      "http://x51.org/x/"
-			      (match-string 1) "/"
-			      (match-string 2) "/"
-			      (match-string 3) (match-string 4)
-			      ".php")
-			     (shimbun-index-url shimbun)))
-		  (setq title (match-string 5))
-		  (setq date  (shimbun-make-date-string
-			       (string-to-int (match-string 1))
-			       (string-to-int (match-string 2))
-			       (string-to-int (match-string 3))))
+		  (setq url (match-string-no-properties 1)
+			title (match-string-no-properties 6)
+			date (shimbun-make-date-string
+			      (string-to-number (match-string 2))
+			      (string-to-number (match-string 3))
+			      (string-to-number (match-string 4))))
 		  (setq id (shimbun-rss-build-message-id shimbun url date))
 		  ;; check old id
 		  (when (shimbun-search-id shimbun id)
@@ -176,16 +162,16 @@
 			 date
 			 id "" 0 0 url)
 			headers))
-		(widen)))))
-	headers))))
+		(widen))))))
+      headers))))
 
 ;; normalize date
 (defun shimbun-x51-prepare-article (shimbun header)
   "Adjust a date header if there's a correct information available."
   (let* ((case-fold-search t)
-	 (start (re-search-forward shimbun-x51-content-start nil t))
+	 (start (re-search-forward (shimbun-content-start shimbun) nil t))
 	 (end (and start
-		   (re-search-forward shimbun-x51-content-end nil t)
+		   (re-search-forward (shimbun-content-end shimbun) nil t)
 		   (prog1
 		       (match-beginning 0)
 		     (goto-char start)))))
@@ -196,7 +182,7 @@
 \\([0-9]*\\)\\(&#26376;\\|月\\)\
 \\([0-9]*\\)\\(&#26085;\\|日\\)\
  ?\\([012][0-9]:[0-5][0-9]\\)"
-	   nil t)
+	   end t)
       (shimbun-header-set-date
        header
        (shimbun-make-date-string
@@ -213,11 +199,9 @@
 (luna-define-method shimbun-clear-contents :before ((shimbun shimbun-x51)
 						    header)
   (shimbun-strip-cr)
-  (shimbun-remove-tags "<script" "</script>")
-  (shimbun-remove-tags "<noscript" "</noscript>")
-  (shimbun-remove-tags "<div class=\"notes\"" "</div>")
-  (shimbun-remove-tags "<div class=\"line\"" "</div>")
-  (shimbun-remove-tags "<div class=\"middlebar\"" "</div>"))
+  (shimbun-remove-tags "script\\|noscript" t)
+  (shimbun-remove-tags "\\(div\\) class=\"\\(?:notes\\|line\\|middlebar\\)\""
+		       t))
 
 (provide 'sb-x51)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-xemacs.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-xemacs.el
--- work/emacs-w3m-1.4.4/shimbun/sb-xemacs.el	2005-03-14 07:31:23.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-xemacs.el	2007-10-17 20:15:58.000000000 +0900
@@ -20,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-yahoo-auctions.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo-auctions.el
--- work/emacs-w3m-1.4.4/shimbun/sb-yahoo-auctions.el	2005-03-23 06:52:02.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo-auctions.el	2011-10-14 09:16:00.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-yahoo-auctions.el --- shimbun backend for Yahoo! AUCTIONS
 
-;; Copyright (C) 2005  ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+;; Copyright (C) 2005, 2006, 2008, 2011 ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
 
 ;; Author: ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
 ;; Keywords: news
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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.
 
 ;;; Code:
 
@@ -39,8 +39,8 @@
 		       (string :tag "Group name")
 		       (string :tag "URL"))))
 
-(defvar shimbun-yahoo-auctions-content-start "<hr SIZE=\"1\" NOSHADE>")
-(defvar shimbun-yahoo-auctions-content-end nil)
+(defvar shimbun-yahoo-auctions-content-start "<!--\nITEMSUMMARY\n-->")
+(defvar shimbun-yahoo-auctions-content-end "<!--\nS\n-->")
 
 (luna-define-method shimbun-groups ((shimbun shimbun-yahoo-auctions))
   (mapcar 'car shimbun-yahoo-auctions-group-alist))
@@ -73,25 +73,6 @@
   ((shimbun shimbun-yahoo-auctions) header)
   (shimbun-real-url (luna-call-next-method)))
 
-(luna-define-method shimbun-make-contents ((shimbun shimbun-yahoo-auctions)
-					   header)
-  (let ((case-fold-search t))
-    (goto-char (point-min))
-    (when (and (stringp (shimbun-content-start-internal shimbun))
-	       (re-search-forward (shimbun-content-start-internal shimbun)
-				  nil t))
-      (delete-region (point-min) (point))
-      (insert "<html>\n<head>\n<base href=\""
-	      (shimbun-article-url shimbun header)
-	      "\">\n</head>\n<body>\n"))
-    (when (and (stringp (shimbun-content-end-internal shimbun))
-	       (re-search-forward (shimbun-content-end-internal shimbun)
-				  nil t))
-      (delete-region (match-beginning 0) (point-max))
-      (insert (shimbun-footer shimbun header t)
-	      "\n</body>\n</html>\n")))
-  (shimbun-make-mime-article shimbun header)
-  (buffer-string))
-
 (provide 'sb-yahoo-auctions)
+
 ;;; sb-yahoo-auctions.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-yahoo-sports.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo-sports.el
--- work/emacs-w3m-1.4.4/shimbun/sb-yahoo-sports.el	2005-03-14 21:50:35.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo-sports.el	2007-10-17 20:15:58.000000000 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -31,9 +31,8 @@
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-yahoo-sports (shimbun shimbun-text) ())
+(luna-define-class shimbun-yahoo-sports (shimbun) ())
 
 (defvar shimbun-yahoo-sports-url "http://sports.yahoo.co.jp/")
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-yahoo.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo.el
--- work/emacs-w3m-1.4.4/shimbun/sb-yahoo.el	2005-03-08 09:19:59.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yahoo.el	2010-11-12 13:37:29.000000000 +0900
@@ -1,9 +1,10 @@
 ;;; sb-yahoo.el --- shimbun backend for news.yahoo.co.jp -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2005
-;; Kazuyoshi KOREEDA <Kazuyoshi.Koreeda@rdmg.mgcs.mei.co.jp>
+;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010
+;; Kazuyoshi KOREEDA
 
-;; Author: Kazuyoshi KOREEDA <Kazuyoshi.Koreeda@rdmg.mgcs.mei.co.jp>
+;; Author: Kazuyoshi KOREEDA <Koreeda.Kazuyoshi@jp.panasonic.com>,
+;;         Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news
 
 ;; This file is a part of shimbun.
@@ -19,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -32,96 +33,299 @@
 ;;; Code:
 
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-yahoo (shimbun shimbun-text) ())
+(luna-define-class shimbun-yahoo (shimbun) ())
+
+(defvar shimbun-yahoo-prefer-text-plain nil
+  "*Non-nil means prefer text/plain articles rather than html articles.")
 
 (defvar shimbun-yahoo-url "http://headlines.yahoo.co.jp/")
 
-(defvar shimbun-yahoo-groups-alist
-  '(("topnews" . "topnews")
-    ("politics" . "pol")
-    ("society" . "soci")
-    ("people" . "peo")
-    ("business-all" . "bus_all")
-    ("market" . "brf")
-    ("stock" . "biz")
-    ("industry" . "ind")
-    ("international" . "int")
-    ("entertainment" . "ent")
-    ("sports" . "spo")
-    ("computer" . "sci")
-    ("hokkaido" . "hok")
-    ("tohoku" . "toh")
-    ("kanto" . "kan")
-    ("sinetsu" . "sin")
-    ("hokuriku" . "hor")
-    ("tokai" . "tok")
-    ("kinki" . "kin")
-    ("chugoku" . "chu")
-    ("sikoku" . "sik")
-    ("kyushu" . "kyu")
-    ("okinawa" . "oki")))
+(defvar shimbun-yahoo-groups-table
+  (let* ((s0 "[\t\n ]*")
+	 (s1 "[\t\n ]+")
+	 (default (list
+		   (concat
+		    "<a" s1 "href=\"\\(?:[^\"]+\\)?"
+		    ;; 1. url
+		    "\\(http://headlines\\.yahoo\\.co\\.jp/hl\\?a="
+		    ;; 2. serial number
+		    "\\("
+		    ;; 3. year
+		    "\\(20[0-9][0-9]\\)"
+		    ;; 4. month
+		    "\\([01][0-9]\\)"
+		    ;; 5. day
+		    "\\([0-3][0-9]\\)"
+		    "[^\"]*\\)\\)"
+		    "\"" s0 ">" s0 "\\(?:<strong>" s0 "\\)?"
+		    ;; 6. subject
+		    "\\([^<]+\\)"
+		    "\\(?:" s0 "</strong>\\)?"
+		    s0 "</a>\\(?:\\(?:[^\n<（]*\\|[\t\n ]*\\)<[^>]+>\\)*" s0
+		    "\\(?:（" s0 "\\(?:<a" s1 "[^>]+>" s0 "\\)?"
+		    ;; 7. source
+		    "\\([^<）]+\\)"
+		    s0 "\\(?:</a>" s0 "\\)?"
+		    s0 "）"
+		    "\\(?:" s0 "-\\(?:[^<]+\)\\)?\
+\\|" s0 "\\(?:<[^>]+>" s0 "\\)?\
+\\(?:[01]?[0-9]月\\)?[0-3]?[0-9]日\\(?:([日月火水木金土])\\)?\\)?\
+\\|[01]?[0-9]月[0-3]?[0-9]日\\(?:([日月火水木金土])\\)?\\)"
+		    s0
+		    ;; 8. hour
+		    "\\([012]?[0-9]\\)"
+		    s0 "時" s0
+		    ;; 9. minute
+		    "\\([0-5]?[0-9]\\)"
+		    s0 "分"
+		    "\\(?:\\(?:" s0 "</[^>]+>\\)?[^<]+<a" s1
+		    "href=\"[^\">]+\">" s0
+		    ;; 10. source
+		    "\\([^<）]+\\)"
+		    s0 "</a>\\)?")
+		   1 2 3 4 5 6 7 8 9 10))
+	 (topnews (list
+		   (concat
+		    "<a" s1 "href=\""
+		    ;; 1. url
+		    "\\(http://headlines\\.yahoo\\.co\\.jp/hl\\?a="
+		    ;; 2. serial number
+		    "\\("
+		    ;; 3. year
+		    "\\(20[0-9][0-9]\\)"
+		    ;; 4. month
+		    "\\([01][0-9]\\)"
+		    ;; 5. day
+		    "\\([0-3][0-9]\\)"
+		    "[^\"]*\\)\\)"
+		    "\"" s0 ">" s0
+		    ;; 6. subject
+		    "\\([^<]+\\)"
+		    s0 "</a>\\(?:" s0 "<[^>]+>\\)+" s0
+		    ;; 7. source
+		    "\\([^<]+\\)"
+		    ".+)" s0
+		    ;; 8. hour
+		    "\\([012]?[0-9]\\)"
+		    s0 "時" s0
+		    ;; 9. minute
+		    "\\([0-5]?[0-9]\\)"
+		    s0 "分配信")
+		   1 2 3 4 5 6 7 8 9)))
+    `(("topnews" "トップ" "topnews" ,@topnews)
+      ("news" "ニュース" news ,@default)
+      ("politics" "政治" "pol" ,@default)
+      ("society" "社会" "soci" ,@default)
+      ("people" "人" "peo" ,@default)
+      ("business-all" "経済総合" "bus_all" ,@default)
+      ("market" "市況" "brf" ,@default)
+      ("stock" "株式" "biz" ,@default)
+      ("industry" "産業" "ind" ,@default)
+      ("international" "海外" "int" ,@default)
+      ("entertainment" "エンターテインメント" "ent" ,@default)
+      ("sports" "スポーツ" "spo" ,@default)
+      ("computer" "コンピュータ" "sci" ,@default)
+      ("zenkoku" "全国" "loc" ,@default)
+      ("hokkaido" "北海道" "hok" ,@default)
+      ("aomori" "青森" "l02" ,@default) ;; not "102" but "l02" ;-)
+      ("iwate" "岩手" "l03" ,@default)
+      ("miyagi" "宮城" "l04" ,@default)
+      ("akita" "秋田" "l05" ,@default)
+      ("yamagata" "山形" "l06" ,@default)
+      ("fukushima" "福島" "l07" ,@default)
+      ("tokyo" "東京" "l13" ,@default)
+      ("kanagawa" "神奈川" "l14" ,@default)
+      ("chiba" "千葉" "l12" ,@default)
+      ("saitama" "埼玉" "l11" ,@default)
+      ("ibaraki" "茨城" "l08" ,@default)
+      ("tochigi" "栃木" "l09" ,@default)
+      ("gunma" "群馬" "l10" ,@default)
+      ("yamanashi" "山梨" "l19" ,@default)
+      ("nagano" "長野" "l20" ,@default)
+      ("niigata" "新潟" "l15" ,@default)
+      ("toyama" "富山" "l16" ,@default)
+      ("ishikawa" "石川" "l17" ,@default)
+      ("fukui" "福井" "l18" ,@default)
+      ("aichi" "愛知" "l23" ,@default)
+      ("gifu" "岐阜" "l21" ,@default)
+      ("shizuoka" "静岡" "l22" ,@default)
+      ("mie" "三重" "l24" ,@default)
+      ("osaka" "大阪" "l27" ,@default)
+      ("hyogo" "兵庫" "l28" ,@default)
+      ("kyoto" "京都" "l26" ,@default)
+      ("shiga" "滋賀" "l25" ,@default)
+      ("nara" "奈良" "l29" ,@default)
+      ("wakayama" "和歌山" "l30" ,@default)
+      ("tottori" "鳥取" "l31" ,@default)
+      ("shimane" "島根" "l32" ,@default)
+      ("okayama" "岡山" "l33" ,@default)
+      ("hiroshima" "広島" "l34" ,@default)
+      ("yamaguchi" "山口" "l35" ,@default)
+      ("tokushima" "徳島" "l36" ,@default)
+      ("kagawa" "香川" "l37" ,@default)
+      ("ehime" "愛媛" "l38" ,@default)
+      ("kochi" "高知" "l39" ,@default)
+      ("fukuoka" "福岡" "l40" ,@default)
+      ("saga" "佐賀" "l41" ,@default)
+      ("nagasaki" "長崎" "l42" ,@default)
+      ("kumamoto" "熊本" "l43" ,@default)
+      ("oita" "大分" "l44" ,@default)
+      ("miyazaki" "宮崎" "l45" ,@default)
+      ("kagoshima" "鹿児島" "l46" ,@default)
+      ("okinawa" "沖縄" "oki" ,@default)))
+  "Alist of group names, their Japanese translations, index pages,
+regexps and numbers.  Where numbers point to the search result in order
+of [0]url, [1]serial number, [2]year, [3]month, [4]day, [5]subject,
+\[6]news source, [7]hour, [8]minute, and [9]news source (the last one
+may not be presented).")
+
 (defvar shimbun-yahoo-groups
-  (mapcar 'car shimbun-yahoo-groups-alist))
+  (mapcar 'car shimbun-yahoo-groups-table))
+
+(defvar shimbun-yahoo-from-address "nobody@example.com")
+(defvar shimbun-yahoo-content-start
+  "[012]?[0-9]時[0-5]?[0-9]分配信[\t\n\r ]*\\(?:</[^>]+>[\t\n\r ]*\\)*")
 
-(defvar shimbun-yahoo-from-address "news-admin@mail.yahoo.co.jp")
-(defvar shimbun-yahoo-content-start "</font><br><br>\n")
-(defvar shimbun-yahoo-content-end   "\n<center>\n")
+(defvar shimbun-yahoo-content-end "[\t\n\r ]*\\(<br>[\t\n\r ]*\\)*\
+<!-+[\t\n\r ]*interest_match_relevant_zone_end[\t\n\r ]*-+>")
 
 (defvar shimbun-yahoo-x-face-alist
   '(("default" . "X-Face: \"Qj}=TahP*`:b#4o_o63:I=\"~wbql=kpF1a>Sp62\
 fpAsVY`saZV[b*GqI!u|i|xKPjNh&P=\n R?n}rh38mkp_:')h=Bh:Rk>0pYF\\I?f\\\
 PvPs3>/KG:03n47U?FC[?DNAR4QAQxE3L;m!L10OM$-]kF\n YD\\]-^qzd#'{(o2cu,\
-(}CMi|3b9JDQ(^D\\:@DE}d2+0S2G{VS@E*1Og7Vj#35[77\"z9XBq9$1uF$+W\n u")))
+\(}CMi|3b9JDQ(^D\\:@DE}d2+0S2G{VS@E*1Og7Vj#35[77\"z9XBq9$1uF$+W\n u")))
 (defvar shimbun-yahoo-expiration-days 7)
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-yahoo))
-  (format "%shl?c=%s&t=l"
-	  (shimbun-url-internal shimbun)
-	  (cdr (assoc (shimbun-current-group-internal shimbun)
-		      shimbun-yahoo-groups-alist))))
+;;;<DEBUG>
+;;  (shimbun-yahoo-index-url shimbun))
+;;
+;;(defun shimbun-yahoo-index-url (shimbun)
+;;;</DEBUG>
+  (let ((group (shimbun-current-group-internal shimbun))
+	(url (shimbun-url-internal shimbun)))
+    (if (string-equal group "news")
+	(concat url "hl")
+      (format "%shl?c=%s&t=l"
+	      url
+	      (nth 2 (assoc group shimbun-yahoo-groups-table))))))
 
 (luna-define-method shimbun-get-headers ((shimbun shimbun-yahoo)
 					 &optional range)
-  (let ((case-fold-search t)
-	headers)
+;;;<DEBUG>
+;;  (shimbun-yahoo-get-headers shimbun range))
+;;
+;;(defun shimbun-yahoo-get-headers (shimbun range)
+;;;</DEBUG>
+  (let* ((case-fold-search t)
+	 (from "Yahoo!ニュース")
+	 (group (shimbun-current-group-internal shimbun))
+	 (numbers (cdr (assoc group shimbun-yahoo-groups-table)))
+	 (jname (pop numbers))
+	 (regexp (progn (setq numbers (cdr numbers)) (pop numbers)))
+	 (pages (shimbun-header-index-pages range))
+	 (count 0)
+	 (index (shimbun-index-url shimbun))
+	 id headers start)
     (catch 'stop
       (while t
-	(while (re-search-forward "<a href=\"\\(http://headlines.yahoo.co.jp/hl\\?a=\\([0-9][0-9][0-9][0-9]\\)\\([0-9][0-9]\\)\\([0-9][0-9]\\)-\\([0-9]+-[^\"]+\\)\\)\">\\([^<]+\\)</a>\\([^0-9]\\|[\n\r]\\)*\\([0-9]+日[^0-9]*\\)?\\([0-9]+\\)時\\([0-9]+\\)分" nil t)
-	  (let ((url (match-string 1))
-		(year (match-string 2))
-		(month (match-string 3))
-		(day (match-string 4))
-		(no (match-string 5))
-		(subject (match-string 6))
-		(hour (string-to-number (match-string 9)))
-		(min (string-to-number (match-string 10)))
-		id time)
-	    (setq id (format "<%s%s%s%s.%s@headlines.yahoo.co.jp>"
-			     year month day no
-			     (shimbun-current-group-internal shimbun)))
-	    (if (shimbun-search-id shimbun id)
-		(throw 'stop nil))
-	    (setq time (format "%02d:%02d" hour min))
-	    (push (shimbun-make-header
-		   0
-		   (shimbun-mime-encode-string subject)
-		   (shimbun-from-address shimbun)
-		   (shimbun-make-date-string (string-to-number year)
-					     (string-to-number month)
-					     (string-to-number day) time)
-		   id "" 0 0 url)
-		  headers)))
-	(if (re-search-forward "<a href=\"\\([^\"]+\\)\">次のページ</a>" nil t)
+	(if (string-equal group "news")
 	    (progn
-	      (shimbun-retrieve-url (prog1
-					(match-string 1)
-				      (erase-buffer))
-				    t)
-	      (goto-char (point-min)))
-	  (throw 'stop nil))))
-    headers))
+	      (when (and (re-search-forward
+			  "<!-+[\t\n ]*main[\t\n ]+start[\t\n ]*-+>" nil t)
+			 (progn
+			   (setq start (match-end 0))
+			   (re-search-forward
+			    "<!-+[\t\n ]*main[\t\n ]+end[\t\n ]*-+>" nil t)))
+		(delete-region (match-beginning 0) (point-max))
+		(delete-region (point-min) start)
+		(goto-char (point-min)))
+	      (when (and (re-search-forward ">[\t\n ]*写真ニュース[\t\n ]*</a>\
+\\(?:[\t\n ]*</[^>]+>\\)+[\y\n ]*\\(<div[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+class=\"ymuiContainer\"\\)" nil t)
+			 (shimbun-end-of-tag "div"))
+		(delete-region (match-beginning 0) (match-end 0))))
+	  (shimbun-remove-tags "<!-+[\t\n ]*アクセスランキング[\t\n ]*-+>"
+			       "<!-+[\t\n ]*/アクセスランキング[\t\n ]*-+>"))
+	(goto-char (point-min))
+	(while (re-search-forward regexp nil t)
+	  (setq id (concat "<"
+			   (save-match-data
+			     (shimbun-replace-in-string
+			      (match-string (nth 1 numbers))
+			      "-" "."))
+			   "%" group ".headlines.yahoo.co.jp>"))
+	  (unless (and (shimbun-search-id shimbun id)
+		       (if (and (>= count 1) ;; We're in the next page.
+				;; Stop fetching iff range is not specified.
+				(not pages))
+			   (throw 'stop nil)
+			 t))
+	    (if (save-match-data
+		  (string-match "記事全文[\t\n ]*\\'"
+				(match-string (nth 5 numbers))))
+		(goto-char (match-end (nth 5 numbers)))
+	      (push (shimbun-create-header
+		     0
+		     (match-string (nth 5 numbers))
+		     (concat from " (" jname "/"
+			     (or (match-string (nth 6 numbers))
+				 (match-string (nth 9 numbers)))
+			     ")")
+		     (shimbun-make-date-string
+		      (string-to-number (match-string (nth 2 numbers)))
+		      (string-to-number (match-string (nth 3 numbers)))
+		      (string-to-number (match-string (nth 4 numbers)))
+		      (format
+		       "%02d:%02d"
+		       (string-to-number (match-string (nth 7 numbers)))
+		       (string-to-number (match-string (nth 8 numbers)))))
+		     id "" 0 0
+		     (match-string (nth 0 numbers)))
+		    headers))))
+	(setq count (1+ count))
+	(goto-char (point-min))
+	(cond ((and pages (>= count pages))
+	       (throw 'stop nil))
+	      ((string-equal group "news")
+	       (if (>= count 2)
+		   (throw 'stop nil)
+		 (erase-buffer)
+		 (shimbun-retrieve-url
+		  "http://headlines.yahoo.co.jp/hl?c=flash"
+		  t)))
+	      ((re-search-forward "<a href=\"\\([^\"]+\\)\">次のページ</a>"
+				  nil t)
+	       (shimbun-retrieve-url (prog1
+					 (match-string 1)
+				       (erase-buffer))
+				     t))
+	      ((and (re-search-forward "<!-+[\t\n ]*過去記事[\t\n ]*-+>"
+				       nil t)
+		    (progn
+		      (setq start (match-end 0))
+		      (re-search-forward "<!-+[\t\n ]*/過去記事[\t\n ]*-+>"
+					 nil t))
+		    (progn
+		      (narrow-to-region start (match-beginning 0))
+		      (goto-char start)
+		      (or (re-search-forward "<option[\t\n ]+value=\"\
+20[0-9][0-9][01][0-9][0-3][0-9]\"[\t\n ]+selected[\t\n ]*>"
+					     nil t)
+			  (re-search-forward "<option[\t\n ]+value=\"\
+20[0-9][0-9][01][0-9][0-3][0-9]\"[\t\n ]*>"
+					     nil t)))
+		    (re-search-forward "<option[\t\n ]+value=\"\
+\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\"[\t\n ]*>"
+				       nil t))
+	       (shimbun-retrieve-url (prog1
+					 (concat index "&d=" (match-string 1))
+				       (erase-buffer))
+				     t))
+	      (t
+	       (throw 'stop nil)))))
+    (shimbun-sort-headers headers)))
 
 (provide 'sb-yahoo)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-yomiuri-html.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yomiuri-html.el
--- work/emacs-w3m-1.4.4/shimbun/sb-yomiuri-html.el	2003-09-08 20:08:21.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yomiuri-html.el	2007-10-17 20:15:58.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; sb-yomiuri-html.el --- shimbun backend for yomiuri online (HTML version) -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001, 2002, 2003, 2005 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
 ;;         Katsumi Yamaoka   <yamaoka@jpl.org>
@@ -19,28 +19,25 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 now semi-obsolete.  You can use sb-yomiuri.el to read
+;; html articles by putting the following line in your init file.
+;;
+;;(setq shimbun-yomiuri-prefer-text-plain nil)
+
 ;;; Code:
 
-(require 'shimbun)
 (require 'sb-yomiuri)
 
 (luna-define-class shimbun-yomiuri-html (shimbun-yomiuri) ())
 
-(defvar shimbun-yomiuri-html-content-start
-  "\n<!-- ▼写真テーブル▼ -->\n\\|\n<!--  honbun start  -->\n")
-
-(defvar shimbun-yomiuri-html-content-end  "\n<!--  honbun end  -->\n")
-
-(luna-define-method shimbun-make-contents ((shimbun shimbun-yomiuri-html)
-					   header)
-  (shimbun-yomiuri-prepare-article shimbun header)
-  (shimbun-make-html-contents shimbun header))
+(defconst shimbun-yomiuri-html-prefer-text-plain nil
+  "Non-nil means prefer text/plain articles rather than html articles.")
 
 (provide 'sb-yomiuri-html)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-yomiuri.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yomiuri.el
--- work/emacs-w3m-1.4.4/shimbun/sb-yomiuri.el	2004-12-06 21:42:35.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-yomiuri.el	2008-01-11 16:43:25.000000000 +0900
@@ -1,5 +1,7 @@
 ;;; sb-yomiuri.el --- shimbun backend for www.yomiuri.co.jp -*- coding: iso-2022-7bit; -*-
 
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Authors
+
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;         Yuuichi Teranishi  <teranisi@gohome.org>,
 ;;         Katsumi Yamaoka    <yamaoka@jpl.org>
@@ -19,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -30,11 +32,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl)) ;; caddr, cadddr, cddddr.
+
 (require 'shimbun)
-(require 'sb-text)
 
-(luna-define-class shimbun-yomiuri
-		   (shimbun-japanese-newspaper shimbun-text) ())
+(luna-define-class shimbun-yomiuri (shimbun-japanese-newspaper shimbun) ())
+
+(defvar shimbun-yomiuri-prefer-text-plain t
+  "*Non-nil means prefer text/plain articles rather than html articles.")
 
 (defvar shimbun-yomiuri-top-level-domain "yomiuri.co.jp"
   "Name of the top level domain for the Yomiuri On-line.")
@@ -46,99 +51,443 @@
 (defvar shimbun-yomiuri-group-table
   (let* ((s0 "[\t\n ]*")
 	 (s1 "[\t\n ]+")
-	 (no-nl "[^\n<>]+")
 	 (default
 	   (list
 	    (concat
 	     "<a" s1 "href=\"/"
 	     ;; 1. url
 	     "\\(%s/news/"
-	     ;; 2,3. serial number
-	     "\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\\([0-9a-z]+\\)"
-	     "\\.htm\\)\">" s0
-	     ;; 4. subject
-	     "\\(" no-nl "\\)"
-	     s0 "("
-	     ;; 5. month
+	     ;; 2. serial number[1]
+	     "\\("
+	     ;; 3. year
+	     "\\(20[0-9][0-9]\\)"
+	     "[01][0-9][0-3][0-9]\\)"
+	     ;; 4. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 5. subject
+	     "\\([^<]+\\)"
+	     s0 "</a>[^<（]*（" s0
+	     ;; 6. month
 	     "\\([01]?[0-9]\\)"
-	     "/"
-	     ;; 6. day
+	     s0 "月" s0
+	     ;; 7. day
+	     "\\([0-3]?[0-9]\\)"
+	     s0 "日" s0
+	     ;; 8. hour:minute
+	     "\\([012][0-9]:[0-5][0-9]\\)")
+	    1 2 4 3 5 6 7 8))
+	 (default2
+	   (list
+	    (concat
+	     "<a" s1 "href=\"/"
+	     ;; 1. url
+	     "\\(%s/"
+	     ;; 2. serial number[1]
+	     "\\("
+	     ;; 3. year
+	     "\\(20[0-9][0-9]\\)"
+	     "[01][0-9][0-3][0-9]\\)"
+	     ;; 4. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 5. subject
+	     "\\([^<]+\\)"
+	     s0 "</a>" s0 "<span" s1 "class=\"date\">"
+	     "\\(?:" s0 "<span" s1 "[^>]+>[^<]+</span>\\)?"
+	     s0 "<span" s1 "class=\"m\">" s0
+	     ;; 6. month
+	     "\\([01]?[0-9]\\)"
+	     s0 "月" s0 "</span>" s0 "<span" s1 "class=\"d\">" s0
+	     ;; 7. day
 	     "\\([0-3]?[0-9]\\)"
-	     s1
-	     ;; 7. hour:minute
-	     "\\([012][0-9]:[0-5][0-9]\\)"
-	     ")" s0 "</a>")
-	    1 2 3 4 5 6 7)))
-    `(("business" "経済" "index.htm" ,@default)
-      ("culture" "芸能・文化" "index.htm" ,@default)
-      ("editorial" "社説・コラム" "index.htm"
+	     s0 "日" s0 "</span>")
+	    1 2 4 3 5 6 7))
+	 (kyoiku
+	  (cons (format (car default2) "kyoiku\\(?:/[^\"./]+\\)+")
+		(cdr default2))))
+    `(("atmoney" "マネー・経済")
+      ("editorial" "社説・コラム" ""
        ,(concat "<a" s1 "href=\"/"
 		;; 1. url
 		"\\(%s/news/"
-		;; 2,3. serial number
-		"\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\\([0-9a-z]+\\)"
-		"\\.htm\\)"
-		"\">" s0
-		;; 4. month(ja)
-		"\\([０１]?[０-９]\\)"
+		;; 2. serial number[1]
+		"\\("
+		;; 3. year
+		"\\(20[0-9][0-9]\\)"
+		"[01][0-9][0-3][0-9]\\)"
+		;; 4. serial number[2]
+		"\\([^.]+\\)"
+		"[^\"]+\\)"
+		"\"[^>]*>" s0
+		;; 5. month
+		;; 6. ja month
+		"\\(?:\\([01]?[0-9]\\)\\|\\([０１]?[０-９]\\)\\)"
 		"月"
-		;; 5. day(ja)
-		"\\([０-３]?[０-９]\\)"
-		"日付・"
-		;; 6. subject
-		"\\(" no-nl "\\)" s0 "</a>")
-       1 2 3 6 4 5)
-      ("kyoiku" "教育メール" "index.htm"
-       ,(concat "<a" s1 "href=\"/"
-		;; 1. url
-		"\\(%s/\\([^\"/]+/\\)+"
-		;; 3,4. serial number
-		"\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\\([0-9a-z]+\\)"
-		"\\.htm\\)"
-		"\"[^>]+>" s0
-		;; 5. subject
+		;; 7. day
+		;; 8. ja day
+		"\\(?:\\([0-3]?[0-9]\\)\\|\\([０-３]?[０-９]\\)\\)"
+		"日付[\t\n 　・]*"
+		;; 9. subject
 		"\\([^<]+\\)"
-		"\\(" s0 "<[^>]+>\\)+" s0
-		;; 7. month
-		"\\([01]?[0-9]\\)"
-		"月\\(" s0 "<[^>]+>\\)+" s0
-		;; 9 day
-		"\\([0-3]?[0-9]\\)"
-		"日")
-       1 3 4 5 7 9)
-      ("national" "社会" "index.htm" ,@default)
-      ("obit" "おくやみ" "index.htm"
-       ,(concat "<a" s1 "href=\"/"
-		;; 1. url
+		s0)
+       1 2 4 3 9 5 7 nil 6 8)
+      ("entertainment" "エンターテインメント")
+      ("iryou" "医療と介護" "news/"
+       ,(concat ">" s0
+		;; 1. ja genre
+		"\\(\\cj+\\)"
+		"[^<]*</a>[^<]*<a" s1 "href=\"/"
+		;; 2. url
 		"\\(%s/news/"
-		;; 2,3. serial number
-		"\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\\([0-9a-z]+\\)"
-		"\\.htm\\)"
-		"\">" s0
-		;; 4. subject
-		"\\(" no-nl "\\)"
-		s0 "("
-		;; 5. month
-		"\\([01]?[0-9]\\)"
-		"/"
-		;; 6. day
-		"\\([0-3]?[0-9]\\)"
-		")" s0 "</a>")
-       1 2 3 4 5 6)
-      ("politics" "政治" "index.htm" ,@default)
-      ("science" "科学" "index.htm" ,@default)
-      ("sports" "スポーツ" "index.htm" ,@default)
-      ("world" "国際" "index.htm" ,@default)))
+		;; 3. genre
+		"\\([^_]+\\)"
+		"_news/"
+		;; 4. serial number[1]
+		"\\("
+		;; 5. year
+		"\\(20[0-9][0-9]\\)"
+		;; 6. month
+		"\\([01][0-9]\\)"
+		;; 7. day
+		"\\([0-3][0-9]\\)"
+		"\\)"
+		;; 8. serial number[2]
+		"\\([^.]+\\)"
+		"[^\"]+\\)"
+		"\"[^>]*>" s0
+		;; 9. subject
+		"\\([^<]+\\)"
+		s0)
+       2 4 8 5 9 6 7 nil nil nil 3 1)
+      ("kyoiku" "教育" "" ,@kyoiku)
+      ("kyoiku.children" "こども")
+      ("kyoiku.english" "英語"
+       "http://www.yomiuri.co.jp/kyoiku/learning/english/"
+       ,@kyoiku)
+      ("kyoiku.qanda" "教育Q&A")
+      ("kyoiku.renaissance" "教育ルネサンス"
+       "http://www.yomiuri.co.jp/kyoiku/renai/")
+      ("kyoiku.special" "特集")
+      ("national" "社会" "" ,@default)
+      ("politics" "政治" "" ,@default)
+      ("science" "科学" "" ,@default)
+      ("sports" "スポーツ" ""
+       ,(concat
+	 "<a" s1 "href=\"/"
+	 ;; 1. url
+	 "\\(%s/"
+	 ;; 2. genre
+	 "\\([^/]+\\)"
+	 "/news/"
+	 ;; 3. serial number[1]
+	 "\\("
+	 ;; 4. year
+	 "\\(20[0-9][0-9]\\)"
+	 "[01][0-9][0-3][0-9]\\)"
+	 ;; 5. serial number[2]
+	 "\\([^.]+\\)"
+	 "[^\"]+\\)"
+	 "\"[^>]*>" s0
+	 ;; 6. subject
+	 "\\([^<]+\\)"
+	 "\\(?:" s0 "<img" s0 "[^>]+>\\)?" s0 "</a>[^<（]*（" s0
+	 ;; 7. month
+	 "\\([01]?[0-9]\\)"
+	 s0 "月" s0
+	 ;; 8. day
+	 "\\([0-3]?[0-9]\\)"
+	 s0 "日" s0
+	 ;; 9. hour:minute
+	 "\\([012][0-9]:[0-5][0-9]\\)")
+       1 3 5 4 6 7 8 9 nil nil 2)
+      ("world" "国際" "" ,@default)))
   "Alist of group names, their Japanese translations, index pages,
 regexps and numbers.
 Regexp may contain the \"%s\" token which is replaced with a
 regexp-quoted group name.  Numbers point to the search result in order
-of [0]a url, [1,2]serial numbers, [3]a subject, [4]a month, [5]a day,
-\[6]an hour:minute and [7-]extra keywords.")
+of [0]url, [1,2]serial numbers, [3]year, [4]subject, [5]month, [6]day,
+\[7]hour:minute, [8]ja month, [9]ja day, [10]genre and [11]ja genre.")
 
-(defvar shimbun-yomiuri-content-start "\n<!--  honbun start  -->\n")
+(defvar shimbun-yomiuri-subgroups-alist
+  (let* ((s0 "[\t\n 　]*")
+	 (s1 "[\t\n ]+")
+	 (default
+	   (list
+	    (concat
+	     "<a" s1 "href=\"/"
+	     ;; 1. url
+	     "\\(%s/"
+	     ;; 2. serial number[1]
+	     "\\("
+	     ;; 3. year
+	     "\\(20[0-9][0-9]\\)"
+	     "[01][0-9][0-3][0-9]\\)"
+	     ;; 4. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 5. subject
+	     "\\([^<]+\\)"
+	     s0 "</a>[^<（]*（" s0
+	     ;; 6. month
+	     "\\([01]?[0-9]\\)"
+	     s0 "月" s0
+	     ;; 7. day
+	     "\\([0-3]?[0-9]\\)"
+	     s0 "日\\(?:" s0
+	     ;; 8. hour:minute
+	     "\\([012][0-9]:[0-5][0-9]\\)\\)?")
+	    1 2 4 3 5 6 7 8))
+	 (default2
+	   (list
+	    (concat
+	     "<a" s1 "href=\"/"
+	     ;; 1. url
+	     "\\(%s/"
+	     ;; 2. serial number[1]
+	     "\\("
+	     ;; 3. year
+	     "\\(20[0-9][0-9]\\)"
+	     ;; 4. month
+	     "\\([01][0-9]\\)"
+	     ;; 5. day
+	     "\\([0-3][0-9]\\)"
+	     "\\)"
+	     ;; 6. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 7. subject
+	     "\\([^<]+\\)"
+	     s0)
+	    1 2 6 3 7 4 5))
+	 (default3
+	   (list
+	    (concat
+	     "<a" s1 "href=\"/"
+	     ;; 1. url
+	     "\\(%s/"
+	     ;; 2. genre
+	     "\\([^/]+\\)"
+	     "/"
+	     ;; 3. serial number[1]
+	     "\\("
+	     ;; 4. year
+	     "\\(20[0-9][0-9]\\)"
+	     ;; 5. month
+	     "\\([01][0-9]\\)"
+	     ;; 6. day
+	     "\\([0-3][0-9]\\)"
+	     "\\)"
+	     ;; 7. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 8. subject
+	     "\\([^<]+\\)"
+	     s0)
+	    1 3 7 4 8 5 6 nil nil nil 2))
+	 (default4
+	   (list
+	    (concat
+	     "<a" s1 "href=\"/"
+	     ;; 1. url
+	     "\\(%s/"
+	     ;; 2. serial number[1]
+	     "\\("
+	     ;; 3. year
+	     "\\(20[0-9][0-9]\\)"
+	     "[01][0-9][0-3][0-9]\\)"
+	     ;; 4. serial number[2]
+	     "\\([^.]+\\)"
+	     "[^\"]+\\)"
+	     "\"[^>]*>" s0
+	     ;; 5. subject
+	     "\\([^<]+\\)"
+	     s0 "</a>" s0 "<span" s1 "class=\"date\">"
+	     "\\(?:" s0 "<span" s1 "[^>]+>[^<]+</span>\\)?"
+	     s0 "<span" s1 "class=\"m\">" s0
+	     ;; 6. month
+	     "\\([01]?[0-9]\\)"
+	     s0 "月" s0 "</span>" s0 "<span" s1 "class=\"d\">" s0
+	     ;; 7. day
+	     "\\([0-3]?[0-9]\\)"
+	     s0 "日" s0 "</span>")
+	    1 2 4 3 5 6 7))
+	 (entertainment
+	  (list
+	   (concat
+	    "alt=\""
+	    ;; 1. ja genre
+	    "\\([^\"]+\\)"
+	    "\"[^>]+>" s0 "</a>\\(?:" s0 "</[^>]+>\\)?[^<]*<a" s1 "href=\"/"
+	    ;; 2. url
+	    "\\(entertainment/%s/"
+	    ;; 3. genre
+	    "\\([^/]+\\)"
+	    "/"
+	    ;; 4. serial number[1]
+	    "\\("
+	    ;; 5. year
+	    "\\(20[0-9][0-9]\\)"
+	    "[01][0-9][0-3][0-9]\\)"
+	    ;; 6. serial number[2]
+	    "\\([^.]+\\)"
+	    "[^\"]+\\)"
+	    "\"[^>]*>" s0
+	    ;; 7. subject
+	    "\\([^<]+\\)"
+	    s0 "</a>[^<（]*（" s0
+	    ;; 8. month
+	    "\\([01]?[0-9]\\)"
+	    s0 "月" s0
+	    ;; 9. day
+	    "\\([0-3]?[0-9]\\)"
+	    s0 "日")
+	   2 4 6 5 7 8 9 nil nil nil 3 1)))
+    `(("atmoney"
+       ("宝くじ" "lottery" "http://www.yomiuri.co.jp/atmoney/lottery/"
+	,(format (car default2) "atmoney/lottery") ,@(cdr default2))
+       ("金融ニュース" "mnews" "http://www.yomiuri.co.jp/atmoney/mnews/"
+	,(format (car default) "atmoney/mnews") ,@(cdr default))
+       ("経済ニュース" "news" "http://www.yomiuri.co.jp/atmoney/news/"
+	,(format (car default) "atmoney/news") ,@(cdr default))
+       ("新製品情報" "pnews" "http://www.yomiuri.co.jp/atmoney/pnews/"
+	,(format (car default) "atmoney/pnews") ,@(cdr default)))
+      ("entertainment"
+       ("映画" nil "http://www.yomiuri.co.jp/entertainment/cinema/"
+	,(format (car entertainment) "cinema") ,@(cdr entertainment))
+       ("ｄｏｎｎａ" "donna" "http://www.yomiuri.co.jp/donna/"
+	,(concat
+	  "<a" s1 "href=\"/"
+	  ;; 1. url
+	  "\\(donna/"
+	  ;; 2. serial number[1]
+	  "\\(do\\)"
+	  "_"
+	  ;; 3. serial number[2]
+	  "\\("
+	  ;; 4. year
+	  "\\([0-9][0-9]\\)"
+	  ;; 5. month
+	  "\\([01][0-9]\\)"
+	  ;; 6. day
+	  "\\([0-3][0-9]\\)"
+	  "\\)"
+	  "[^\"]+\\)"
+	  "[^>]*>" s0
+	  ;; 7. subject
+	  "\\([^<]+\\)")
+	1 2 3 4 7 5 6)
+       ("DVD情報" "dvd" "http://www.yomiuri.co.jp/entertainment/cinema/dvd/"
+	,(format (car default) "entertainment/cinema/dvd") ,@(cdr default))
+       ("ジブリをいっぱい" "ghibli"
+	"http://www.yomiuri.co.jp/entertainment/ghibli/"
+	,(concat
+	  "<a" s1 "href=\""
+	  ;; 1. url
+	  "\\(cnt_"
+	  ;; 2. genre
+	  "\\([^_]+\\)"
+	  "_"
+	  ;; 3. serial number[1]
+	  "\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)"
+	  ;; 4. serial number[2]
+	  "\\([^.]+\\)"
+	  "[^\"]+\\)"
+	  "[^>]*>" s0
+	  ;; 5. subject
+	  "\\([^<]+\\)"
+	  "</a>" s0 "（"
+	  ;; 6. year
+	  "\\(20[0-9][0-9]\\)" "年"
+	  ;; 7. month
+	  "\\([01]?[0-9]\\)" "月"
+	  ;; 8. day
+	  "\\([0-3]?[0-9]\\)" "日")
+	1 3 4 6 5 7 8 nil nil nil 2)
+       ("ヘザーの映画館" "heather"
+	"http://www.yomiuri.co.jp/entertainment/heather/"
+	,(format (car entertainment) "heather") ,@(cdr entertainment))
+       ("音楽" "music" "http://www.yomiuri.co.jp/entertainment/music/"
+	,(format (car default3) "entertainment/music") ,@(cdr default3))
+       ("ニュース" "news" "http://www.yomiuri.co.jp/entertainment/news/"
+	,(format (car default) "entertainment/news") ,@(cdr default))
+       ("舞台" "stage" "http://www.yomiuri.co.jp/entertainment/stage/"
+	,(format (car entertainment) "stage") ,@(cdr entertainment))
+       ("ＴＶ" "tv" "http://www.yomiuri.co.jp/entertainment/tv/"
+	,(format (car default) "entertainment/tv") ,@(cdr default))
+       ("Ｙ＆Ｙテレビ" "yy" "http://www.yomiuri.co.jp/entertainment/yy/"
+	,(format (car default3) "entertainment/yy") ,@(cdr default3)))
+      ("kyoiku"
+       ("ニュース" nil "http://www.yomiuri.co.jp/kyoiku/news/"
+	,(format (car default4) "kyoiku/news") ,@(cdr default4))
+       ("教育行政" nil "http://www.yomiuri.co.jp/kyoiku/news2/06.htm"
+	,(format (car default4) "kyoiku/news2") ,@(cdr default4))
+       ("ボランティア・その他" nil
+	"http://www.yomiuri.co.jp/kyoiku/news2/08.htm"
+	,(format (car default4) "kyoiku/news2") ,@(cdr default4)))
+      ("kyoiku.children"
+       ("Ｊキッズ通信" "jkids"
+	"http://www.yomiuri.co.jp/kyoiku/children/jkids/"
+	,(format (car default4) "kyoiku/children/jkids") ,@(cdr default4))
+       ("子どもの心" "kodomo.hagukumu"
+	"http://www.yomiuri.co.jp/kyoiku/hagukumu/kodomo/"
+	,(format (car default4) "kyoiku/hagukumu/kodomo") ,@(cdr default4))
+       ("ニュースウィークリー" "weekly"
+	"http://www.yomiuri.co.jp/kyoiku/children/weekly/"
+	,(format (car default4) "kyoiku/children/weekly") ,@(cdr default4)))
+      ("kyoiku.qanda"
+       ("教育相談" "consul" "http://www.yomiuri.co.jp/kyoiku/qanda/consul/"
+	,(format (car default4) "kyoiku/qanda/consul") ,@(cdr default4))
+       ("悩みのち晴れ" "worries"
+	"http://www.yomiuri.co.jp/kyoiku/qanda/worries/"
+	,(format (car default4) "kyoiku/qanda/worries") ,@(cdr default4)))
+      ("kyoiku.special"
+       ("受験ＡＢＣ" "s06" "http://www.yomiuri.co.jp/kyoiku/special/s06/"
+	,(format (car default4) "kyoiku/special/s06") ,@(cdr default4)))
+      ("national"
+       ("文化" "culture" "http://www.yomiuri.co.jp/national/culture/"
+	,(format (car default) "national/culture/news") ,@(cdr default))
+       ("おくやみ" "obit" "http://www.yomiuri.co.jp/national/obit/"
+	,(format (car default2) "national/obit/news") ,@(cdr default2)))
+      ("sports"
+       ("エトセトラ" "etc" "http://www.yomiuri.co.jp/sports/etc/"
+	,(format (car default) "sports/etc/news") ,@(cdr default))
+       ("ゴルフ" "golf" "http://www.yomiuri.co.jp/sports/golf/"
+	,(format (car default) "sports/golf/news") ,@(cdr default))
+       ("大リーグ" "mlb" "http://www.yomiuri.co.jp/sports/mlb/"
+	,(format (car default) "sports/mlb/news") ,@(cdr default))
+       ("プロ野球" "npb" "http://www.yomiuri.co.jp/sports/npb/"
+	,(format (car default) "sports/npb/news") ,@(cdr default))
+       ("サッカー" "soccer" "http://www.yomiuri.co.jp/sports/soccer/"
+	,(format (car default) "sports/soccer/news") ,@(cdr default))
+       ("東京六大学野球07" "ubb07" "http://www.yomiuri.co.jp/sports/ubb07/"
+	,(format (car default) "sports/ubb07/news") ,@(cdr default)))))
+  "Alist of parent groups and lists of subgenres and tables for subgroups.
+Each table is the same as the `cdr' of the element of
+`shimbun-yomiuri-group-table'.")
+
+(defvar shimbun-yomiuri-content-start
+  "\n<!--// contents_area_start //-->\n\
+\\|\n<!--// article_start //-->\n\
+\\|\n<!-- ▼写真テーブル▼ -->\n\
+\\|\n<!--  honbun start  -->\n")
+
+(defvar shimbun-yomiuri-content-end
+  "\n<!--// contents_area_end //-->\n\
+\\|\n<!--// article_end //-->\n\
+\\|\n<!--  honbun end  -->\n")
+
+(defvar shimbun-yomiuri-text-content-start
+  "\n<!--// contents_area_start //-->\n\
+\\|\n<!--// article_start //-->\n\
+\\|\n<!--  honbun start  -->\n")
 
-(defvar shimbun-yomiuri-content-end  "\n<!--  honbun end  -->\n")
+(defvar shimbun-yomiuri-text-content-end shimbun-yomiuri-content-end)
 
 (defvar shimbun-yomiuri-x-face-alist
   '(("default" . "X-Face: #sUhc'&(fVr$~<rt#?PkH,u-.fV(>y)\
@@ -148,16 +497,16 @@
 (defvar shimbun-yomiuri-expiration-days 7)
 
 (luna-define-method initialize-instance :after ((shimbun shimbun-yomiuri)
-						 &rest init-args)
+						&rest init-args)
   (shimbun-set-server-name-internal shimbun "讀売新聞")
-  (shimbun-set-from-address-internal shimbun
-				     (concat "webmaster@www."
-					     shimbun-yomiuri-top-level-domain))
+  (shimbun-set-from-address-internal shimbun "nobody@example.com")
   ;; To share class variables between `shimbun-yomiuri' and its
   ;; successor `shimbun-yomiuri-html'.
   (shimbun-set-x-face-alist-internal shimbun shimbun-yomiuri-x-face-alist)
   (shimbun-set-expiration-days-internal shimbun
 					shimbun-yomiuri-expiration-days)
+  (shimbun-set-content-start-internal shimbun shimbun-yomiuri-content-start)
+  (shimbun-set-content-end-internal shimbun shimbun-yomiuri-content-end)
   shimbun)
 
 (luna-define-method shimbun-groups ((shimbun shimbun-yomiuri))
@@ -168,255 +517,352 @@
 		shimbun-yomiuri-group-table)))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-yomiuri))
-  (let ((group (shimbun-current-group-internal shimbun)))
-    (concat shimbun-yomiuri-url group "/"
-	    (nth 2 (assoc group shimbun-yomiuri-group-table)))))
+  (let* ((group (shimbun-current-group-internal shimbun))
+	 (index (nth 2 (assoc group shimbun-yomiuri-group-table))))
+    (cond ((not index)
+	   "about:blank")
+	  ((string-match "\\`http:" index)
+	   index)
+	  (t
+	   (concat shimbun-yomiuri-url group "/" index)))))
 
-(defmacro shimbun-yomiuri-japanese-string-to-number (string)
+(defun shimbun-yomiuri-japanese-string-to-number (string)
   "Convert a Japanese zenkaku number to just a number."
-  (let ((alist ''((?０ . 0) (?１ . 1) (?２ . 2) (?３ . 3) (?４ . 4)
-		  (?５ . 5) (?６ . 6) (?７ . 7) (?８ . 8) (?９ . 9))))
-    (if (= (length "０") 1)
-	`(let* ((str ,string)
-		(alist ,alist)
-		(len (length str))
-		(idx 0)
-		(num 0))
-	   (while (< idx len)
-	     (setq num (+ (cdr (assq (aref str idx) alist)) (* num 10))
-		   idx (1+ idx)))
-	   num)
-      `(let* ((str ,string)
-	      (alist ,alist)
-	      (len (length str))
-	      (idx 0)
-	      (num 0)
-	      char)
-	 (while (< idx len)
-	   (setq char (sref str idx)
-		 num (+ (cdr (assq char alist)) (* num 10))
-		 idx (+ idx (char-bytes char))))
-	 num))))
-
-(defun shimbun-yomiuri-shorten-brackets-in-string (string)
-  "Replace Japanes zenkaku brackets with ascii characters in STRING.
-It does also shorten too much spaces."
-  (save-match-data
-    (with-temp-buffer
-      (insert string)
-      (let ((alist '(("（" . " (") ("）" . ") ") ("［" . " [")
-		     ("］" . "] ") ("｛" . " {") ("｝" . "} ")))
-	    elem)
-	(while alist
-	  (setq elem (pop alist))
-	  (goto-char (point-min))
-	  (while (search-forward (car elem) nil t)
-	    (replace-match (cdr elem))))
-	(goto-char (point-min))
-	(while (re-search-forward "[\t 　]+" nil t)
-	  (replace-match " "))
-	(goto-char (point-min))
-	(while (re-search-forward "\\([])}]\\) \\([])}]\\)" nil t)
-	  (replace-match "\\1\\2")
-	  (forward-char -1))
-	(goto-char (point-min))
-	(while (re-search-forward "\\([[({]\\) \\([[({]\\)" nil t)
-	  (replace-match "\\1\\2")
-	  (forward-char -1))
-	(goto-char (point-min))
-	(while (re-search-forward " ?\\([「」]\\) ?" nil t)
-	  (replace-match "\\1"))
-	(goto-char (point-min))
-	(while (re-search-forward "^ \\| $" nil t)
-	  (replace-match "")))
-      (buffer-string))))
-
-(defun shimbun-yomiuri-get-headers (shimbun)
-  "Return a list of headers."
-  (let ((group (shimbun-current-group-internal shimbun))
-	(from (shimbun-from-address shimbun))
-	(case-fold-search t)
-	cyear cmonth month day time regexp numbers headers)
-    (setq cyear (decode-time)
-	  cmonth (nth 4 cyear)
-	  cyear (nth 5 cyear))
-    ;; Extracting top news.
-    (when (and (not (member group '("editorial" "kyoiku" "obit")))
-	       (re-search-forward
-		(format
-		 (eval-when-compile
+  (let ((alist '((?０ . 0) (?１ . 1) (?２ . 2) (?３ . 3) (?４ . 4)
+		 (?５ . 5) (?６ . 6) (?７ . 7) (?８ . 8) (?９ . 9)))
+	(len (length string))
+	(idx 0)
+	(num 0))
+    (while (< idx len)
+      (setq num (+ (cdr (assq (aref string idx) alist)) (* num 10))
+	    idx (1+ idx)))
+    num))
+
+(defun shimbun-yomiuri-get-top-header (group from shimbun)
+  "Return a list of a header for the top news."
+  (when (and (search-forward "<!--// top_news_start -->" nil t)
+	     (re-search-forward
+	      (format
+	       (eval-when-compile
+		 (let ((s0 "[\t\n ]*")
+		       (s1 "[\t\n ]+"))
 		   (concat
-		    "<a[\t\n ]+href=\"/"
+		    "<a" s1 "href=\"/"
 		    ;; 1. url
-		    "\\(%s/news/"
-		    ;; 2. serial number
-		    "\\(20[0-9][0-9]"
-		    ;; 3. month
-		    "\\([01][0-9]\\)"
-		    ;; 4. day
-		    "\\([0-3][0-9]\\)"
-		    "[0-9a-z]+\\)"
-		    "\\.htm\\)"
-		    "\">[\t\n ]*\\(<[^<>]+>[\t\n ]*\\)+"
+		    "\\(%s/"
+		    ;; 2. genre
+		    "\\(?:\\([^/]+\\)/\\)?"
+		    "news/"
+		    ;; 3. serial number[1]
+		    "\\("
+		    ;; 4. year
+		    "\\(20[0-9][0-9]\\)"
+		    "[01][0-9][0-3][0-9]\\)"
+		    ;; 5. serial number[2]
+		    "\\([^.]+\\)"
+		    "[^\"]+\\)"
+		    "\"[^>]*>" s0
 		    ;; 6. subject
-		    "\\([^<>]+\\)"
-		    "[\t\n ]*<"))
-		 (regexp-quote group))
-		nil t))
-      (setq month (string-to-number (match-string 3))
-	    day (string-to-number (match-string 4)))
-      (save-match-data
-	(when (re-search-forward
-	       (concat "(\\([01]?[0-9]\\)/\\([0-3]?[0-9]\\)[\t\n ]+\
-\\([012][0-9]:[0-5][0-9]\\))[\t\n ]+<a[\t\n ]+href=\"/"
-		       (regexp-quote (match-string 1)) "\"")
-	       nil t)
-	  (setq month (string-to-number (match-string 1))
-		day (string-to-number (match-string 2))
-		time (match-string 3))))
-      (push (shimbun-create-header
-	     ;; number
-	     0
-	     ;; subject
-	     (match-string 6)
-	     ;; from
-	     from
-	     ;; date
-	     (shimbun-make-date-string (cond ((>= (- month cmonth) 2)
-					      (1- cyear))
-					     ((and (= 1 month) (= 12 cmonth))
-					      (1+ cyear))
-					     (t
-					      cyear))
-				       month day time)
-	     ;; id
-	     (concat "<" (buffer-substring (match-beginning 2)
-					   (match-end 4))
-		     "." (buffer-substring (match-end 4)
-					   (match-end 2))
-		     "%" group "." shimbun-yomiuri-top-level-domain ">")
-	     ;; references, chars, lines
-	     "" 0 0
-	     ;; xref
-	     (concat shimbun-yomiuri-url (match-string 1)))
-	    headers))
-    (setq regexp (assoc group shimbun-yomiuri-group-table)
-	  numbers (nthcdr 4 regexp)
-	  regexp (format (nth 3 regexp) (regexp-quote group)))
-    ;; Generating headers.
-    (while (re-search-forward regexp nil t)
-      (if (string-equal group "editorial")
-	  (setq month (shimbun-yomiuri-japanese-string-to-number
-		       (match-string (nth 4 numbers)))
-		day (shimbun-yomiuri-japanese-string-to-number
-		     (match-string (nth 5 numbers))))
-	(setq month (string-to-number (match-string (nth 4 numbers)))
-	      day (string-to-number (match-string (nth 5 numbers)))))
-      (push (shimbun-make-header
-	     ;; number
-	     0
-	     ;; subject
-	     (if (string-equal "editorial" group)
-		 (shimbun-mime-encode-string
-		  (format "%02d/%02d %s"
+		    "\\([^<]+\\)"
+		    s0)))
+	       group)
+	      nil t))
+    (let* ((url (shimbun-expand-url (match-string 1) shimbun-yomiuri-url))
+	   (genre (match-string 2))
+	   (id (concat "<" (match-string 3) "." (match-string 5)
+		       "%" (when genre
+			     (concat genre "."))
+		       group "." shimbun-yomiuri-top-level-domain ">"))
+	   year subject)
+      (prog1
+	  (unless (shimbun-search-id shimbun id)
+	    (setq year (string-to-number (match-string 4))
+		  subject (match-string 6))
+	    (when (re-search-forward
+		   (eval-when-compile
+		     (let ((s0 "[\t\n ]*"))
+		       (concat
+			">" s0 "（" s0
+			;; 1. month
+			"\\([01]?[0-9]\\)"
+			s0 "月" s0
+			;; 2. day
+			"\\([0-3]?[0-9]\\)"
+			s0 "日" s0
+			;; 3. hour:minute
+			"\\([012][0-9]:[0-5][0-9]\\)"
+			s0 "）" s0 "<")))
+		   nil t)
+	      (list (shimbun-create-header
+		     0
+		     subject
+		     from
+		     (shimbun-make-date-string
+		      year
+		      (string-to-number (match-string 1))
+		      (string-to-number (match-string 2))
+		      (match-string 3))
+		     id "" 0 0 url))))
+	(search-forward "<!--// top_news_end //-->" nil t)))))
+
+(defun shimbun-yomiuri-get-headers (shimbun)
+  "Return a list of headers."
+  (let* ((group (shimbun-current-group-internal shimbun))
+	 (from (concat (shimbun-server-name shimbun)
+		       " (" (shimbun-current-group-name shimbun) ")"))
+	 (case-fold-search t)
+	 (regexp (assoc group shimbun-yomiuri-group-table))
+	 (subgroups (cdr (assoc group shimbun-yomiuri-subgroups-alist)))
+	 numbers headers subject month day genre subgenre jgenre id year
+	 subgrp)
+    (setq regexp
+	  (when (setq numbers (nthcdr 4 regexp))
+	    (format (nth 3 regexp) (regexp-quote group))))
+    (catch 'stop
+      ;; The loop for fetching all the articles in the subgroups.
+      (while t
+	(shimbun-strip-cr)
+	(goto-char (point-min))
+	;; Extract top news.
+	(when (member group '("atmoney" "entertainment" "national" "politics"
+			      "science" "sports" "world"))
+	  (setq headers
+		(nconc headers
+		       (shimbun-yomiuri-get-top-header group from shimbun))))
+	(when regexp
+	  (while (re-search-forward regexp nil t)
+	    (setq subject (match-string (nth 4 numbers))
+		  month (if (and (nth 8 numbers)
+				 (match-beginning (nth 8 numbers)))
+			    (shimbun-yomiuri-japanese-string-to-number
+			     (match-string (nth 8 numbers)))
+			  (string-to-number (match-string (nth 5 numbers))))
+		  day (if (and (nth 9 numbers)
+			       (match-beginning (nth 9 numbers)))
+			  (shimbun-yomiuri-japanese-string-to-number
+			   (match-string (nth 9 numbers)))
+			(string-to-number (match-string (nth 6 numbers))))
+		  genre (or subgenre
+			    (when (nth 10 numbers)
+			      (match-string (nth 10 numbers))))
+		  jgenre (when (nth 11 numbers)
+			   (match-string (nth 11 numbers))))
+	    (cond ((string-equal group "editorial")
+		   (setq subject
+			 (format
+			  "%02d/%02d %s"
 			  month day
-			  (shimbun-yomiuri-shorten-brackets-in-string
-			   (match-string (nth 3 numbers)))))
-	       (shimbun-mime-encode-string (match-string (nth 3 numbers))))
-	     ;; from
-	     from
-	     ;; date
-	     (shimbun-make-date-string (cond ((>= (- month cmonth) 2)
-					      (1- cyear))
-					     ((and (= 1 month) (= 12 cmonth))
-					      (1+ cyear))
-					     (t
-					      cyear))
-				       month day
-				       (when (nth 6 numbers)
-					 (match-string (nth 6 numbers))))
-	     ;; id
-	     (concat "<" (match-string (nth 1 numbers))
-		     "." (match-string (nth 2 numbers))
-		     "%" group "." shimbun-yomiuri-top-level-domain ">")
-	     ;; references, chars, lines
-	     "" 0 0
-	     ;; xref
-	     (concat shimbun-yomiuri-url (match-string (nth 0 numbers))))
-	    headers))
+			  (save-match-data
+			    (if (string-match "\\`［\\(.+\\)］「\\(.+\\)」\\'"
+					      subject)
+				(replace-match "\\1: \\2" nil nil subject)
+			      subject)))))
+		  (jgenre
+		   (setq subject (concat "[" jgenre "] " subject))))
+	    (setq id (concat "<" (match-string (nth 1 numbers))
+			     "." (match-string (nth 2 numbers))
+			     "%" (when genre
+				   (concat genre "."))
+			     (mapconcat
+			      'identity
+			      (nreverse (save-match-data
+					  (split-string group "\\.")))
+			      ".")
+			     "." shimbun-yomiuri-top-level-domain ">"))
+	    (unless (shimbun-search-id shimbun id)
+	      (when (< (setq year (string-to-number
+				   (match-string (nth 3 numbers))))
+		       100)
+		(setq year (+ year 2000)))
+	      (push (shimbun-create-header
+		     0 subject from
+		     (shimbun-make-date-string
+		      year month day
+		      (when (and (nth 7 numbers)
+				 (match-beginning (nth 7 numbers)))
+			(match-string (nth 7 numbers))))
+		     id "" 0 0
+		     (shimbun-expand-url
+		      (match-string (nth 0 numbers))
+		      (if (string-match "ジブリをいっぱい" from)
+			  "http://www.yomiuri.co.jp/entertainment/ghibli/"
+			shimbun-yomiuri-url)))
+		    headers))))
+	(if subgroups
+	    (progn
+	      (erase-buffer)
+	      (setq subgrp (pop subgroups)
+		    from (concat (shimbun-server-name shimbun)
+				 " (" (car subgrp) ")")
+		    subgenre (cadr subgrp))
+	      (shimbun-retrieve-url (caddr subgrp))
+	      (setq regexp (cadddr subgrp)
+		    numbers (cddddr subgrp)))
+	  (throw 'stop nil))))
     (shimbun-sort-headers headers)))
 
+(defun shimbun-yomiuri-get-headers-kyoiku-renaissance (shimbun)
+  (let ((from (concat (shimbun-server-name shimbun)
+		      " (%s/" (shimbun-current-group-name shimbun) ")"))
+	(case-fold-search t)
+	next genre start end id headers)
+    (while (cond ((eq next 'none)
+		  nil)
+		 (next
+		  (set-match-data next)
+		  (goto-char (match-end 0)))
+		 (t
+		  (re-search-forward
+		   "<h3[\t\n ]+class=\"hdst\">[\t\n ]*\\([^<]+\\)[\t\n ]*</h3>"
+		   nil t)))
+      (setq genre (match-string 1)
+	    start (match-end 0))
+      (if (re-search-forward
+	   "<h3[\t\n ]+class=\"hdst\">[\t\n ]*\\([^<]+\\)[\t\n ]*</h3>"
+	   nil t)
+	  (setq end (match-beginning 0)
+		next (match-data))
+	(setq end nil
+	      next 'none))
+      (goto-char start)
+      (while (re-search-forward "\
+<a[\t\n ]+href=\"/\\(kyoiku/renai/\\(20[0-9][0-9][01][0-9][0-3][0-9]\\)\
+\\([^.]+\\)[^\"]+\\)\"[^>]*>[\t\n ]*\\([^<]+\\)[\t\n ]*</a>[\t\n ]*\
+<span[\t\n ]+class=\"date\">[\t\n ]*<span[\t\n ]+class=\"y\">[\t\n ]*\
+\\(20[0-9][0-9]\\)[\t\n ]*年[\t\n ]*</span>[\t\n ]*<span[\t\n ]+class=\"m\">\
+\[\t\n ]*\\([01]?[0-9]\\)[\t\n ]*月[\t\n ]*</span>[\t\n ]*\
+<span[\t\n ]+class=\"d\">[\t\n ]*\\([0-3]?[0-9]\\)[\t\n ]*日[\t\n ]*</span>"
+				end t)
+	(setq id (concat "<" (match-string 2) "." (match-string 3)
+			 "%renai.kyoiku." shimbun-yomiuri-top-level-domain
+			 ">"))
+	(unless (shimbun-search-id shimbun id)
+	  (push (shimbun-create-header
+		 0 (match-string 4) (format from genre)
+		 (shimbun-make-date-string
+		  (string-to-number (match-string 5))
+		  (string-to-number (match-string 6))
+		  (string-to-number (match-string 7)))
+		 id "" 0 0
+		 (shimbun-expand-url (match-string 1) shimbun-yomiuri-url))
+		headers))))
+    headers))
+
 (luna-define-method shimbun-get-headers ((shimbun shimbun-yomiuri)
 					 &optional range)
-  (shimbun-yomiuri-get-headers shimbun))
+  (if (string-equal (shimbun-current-group-internal shimbun)
+		    "kyoiku.renaissance")
+      (shimbun-yomiuri-get-headers-kyoiku-renaissance shimbun)
+    (shimbun-yomiuri-get-headers shimbun)))
 
 (defun shimbun-yomiuri-prepare-article (shimbun header)
-  "Prepare an article: adjusting a date header if there is a correct
-information available, removing useless contents, etc."
-  (let ((group (shimbun-current-group-internal shimbun))
-	(case-fold-search t)
-	start)
-    (if (string-equal group "kyoiku")
-	(progn
-	  (when (or (re-search-forward "\
-<!--[\t\n ]*▼写真▼[\t\n ]*-->[\t\n ]*"
-				       nil t)
-		    (re-search-forward "\
-<!--[\t\n ]*InstanceBeginEditable[\t\n ]+name=\"docbody\"[\t\n ]*-->[\t\n ]*"
-				       nil t))
-	    (delete-region (point-min) (point)))
-	  (when (or (re-search-forward
-		     "[\t\n ]*<!--[\t\n ]*▲日付▲[\t\n ]*-->"
-		     nil t)
-		    (re-search-forward "[\t\n ]*\
-<div[\t\n ]+.+</div>[\t\n ]*<!--[\t\n ]*▼フッタ−ナビ▼[\t\n ]*-->"
-				       nil t)
-		    (re-search-forward
-		     "[\t\n ]*<!--[\t\n ]*InstanceEndEditable[\t\n ]*-->"
-		     nil t))
-	    (delete-region (match-beginning 0) (point-max)))
-	  (goto-char (point-min))
-	  (when (re-search-forward "\
-<div[\t\n ]+class=\"enlargedphoto\">\\([\t\n ]*写真の拡大[\t\n ]*\
-<img[\t\n ]*src=[^>]+>[\t\n ]*\\)"
-				   nil t)
-	    (delete-region (match-beginning 1) (match-end 1))))
-      (when (and (re-search-forward (shimbun-content-start-internal shimbun)
-				    nil t)
-		 (setq start (point))
-		 (re-search-forward (shimbun-content-end-internal shimbun)
-				    nil t))
-	(narrow-to-region start (match-beginning 0))
-	(goto-char (point-max))
-	(forward-line -1)
-	(when (re-search-forward "\\(20[0-9][0-9]\\)/\\(1?[0-9]\\)/\
-\\([123]?[0-9]\\)/\\([012][0-9]:[0-5][0-9]\\)"
-				 nil t)
-	  (shimbun-header-set-date
-	   header
-	   (shimbun-make-date-string
-	    (string-to-number (match-string 1))
-	    (string-to-number (match-string 2))
-	    (string-to-number (match-string 3))
-	    (match-string 4))))
-	(goto-char (point-min))
-	(shimbun-remove-tags "<!--  rectangle start  -->"
-			     "<!--  rectangle end  -->")
-	;; Break continuous lines.
-	(goto-char (point-min))
-	(when (and (string-equal group "editorial")
-		   (string-match " \\(よみうり寸評\\|編集手帳\\)\\'"
-				 (shimbun-header-subject header 'no-encode)))
-	  (goto-char (point-min))
-	  (while (search-forward "◆" nil t)
-	    (replace-match "。<br>\\&<br>")))
-	(widen))))
-  (goto-char (point-min)))
+  (shimbun-with-narrowed-article
+   shimbun
+   ;; Correct Date header.
+   (when (re-search-forward
+	  (eval-when-compile
+	    (let ((s0 "[\t\n ]*")
+		  (s1 "[\t\n ]+"))
+	      (concat
+	       "<!--" s0 "//" s1 "date_start" s1 "//" s0 "-->" s0
+	       ;; 1. year
+	       "\\(20[0-9][0-9]\\)"
+	       s0 "年" s0
+	       ;; 2. month
+	       "\\([01]?[0-9]\\)"
+	       s0 "月" s0
+	       ;; 3. day
+	       "\\([0-3]?[0-9]\\)"
+	       s0 "日" s0
+	       ;; 4. hour
+	       "\\([012]?[0-9]\\)"
+	       s0 "時" s0
+	       ;; 5. minute
+	       "\\([0-5]?[0-9]\\)"
+	       s0 "分" s0 "<!--" s0 "//" s1 "date_end" s1 "//" s0 "-->")))
+	  nil t)
+     (shimbun-header-set-date
+      header
+      (shimbun-make-date-string
+       (string-to-number (match-string 1))
+       (string-to-number (match-string 2))
+       (string-to-number (match-string 3))
+       (format "%02d:%02d"
+	       (string-to-number (match-string 4))
+	       (string-to-number (match-string 5)))))
+     (goto-char (point-min)))
+   ;; Remove the フォトニュース, the 写真の拡大 buttons, etc.
+   (while (re-search-forward
+	   (eval-when-compile
+	     (let ((s0 "[\t\n ]*")
+		   (s1 "[\t\n ]+")
+		   (n1 "[^\t\n >]+"))
+	       (concat
+		s0
+		"\\(?:"
+		"<a\\(?:" s1 n1 "\\)*" s1
+		"\\(?:class=\"photo-pn\"\\|target=\"photoWin\"\\)"
+		"\\(?:" s1 n1 "\\)*" s0 ">"
+		"\\|"
+		"<img\\(?:" s1 n1 "\\)*" s1
+		"\\(?:alt=\"フォトニュース\"\\|class=\"photo-el\"\\)"
+		"\\(?:" s1 n1 "\\)*" s0 ">"
+		"\\|"
+		"<div" s1
+		"class=\"enlargedphoto\">\\(?:[^<>]+\\)?"
+		"<img" s1 "[^>]+>" s0 "</div>"
+		"\\|"
+		"<div" s1 "class=\"[^\"]+\">" s0
+		"<img\\(?:" s1 n1 "\\)*" s1 "src=\"/g/d\\.gif\""
+		"\\(?:" s1 n1 "\\)*" s0 ">" s0 "</div>"
+		"\\|"
+		s0 "rectangle(\"[^\"]+\");" s0
+		"\\)" s0)))
+	   nil t)
+     (delete-region (match-beginning 0) (match-end 0)))
+   (goto-char (point-min))
+   ;; Replace 写真の拡大 with 写真.
+   (while (re-search-forward
+	   (eval-when-compile
+	     (let ((s1 "[\t\n ]+")
+		   (n1 "[^\t\n >]+"))
+	       (concat "<img\\(?:" s1 n1 "\\)*" s1
+		       "alt=\"写真\\(の拡大\\)\"")))
+	   nil t)
+     (delete-region (match-beginning 1) (match-end 1)))
+   ;; Remove javascripts which will appear in text/plain articles.
+   (shimbun-remove-tags "<!--// rectangle_start //-->"
+			"<!--// rectangle_end //-->")
+   (goto-char (point-min))
+   (let ((group (shimbun-current-group-internal shimbun)))
+     (cond ((string-equal group "editorial")
+	    ;; Break continuous lines.
+	    (when (string-match " \\(?:よみうり寸評\\|編集手帳\\)\\'"
+				(shimbun-header-subject header 'no-encode))
+	      (while (search-forward "◆" nil t)
+		(replace-match "。<br><br>\n　"))))
+	   ((string-equal group "entertainment")
+	    ;; Remove trailing garbage.
+	    (when (re-search-forward "[\t\n ]*\
+<!-+<p[\t\n ]+class=\"align-c\">◇+</p>-+>[\t\n ]*"
+				     nil t)
+	      (delete-region (match-beginning 0) (match-end 0)))
+	    ;; Remove nav and track-back button, etc.
+	    (shimbun-remove-tags
+	     "[\t\n ]*<div[\t\n ]+class=\"\\(?:cl\\|nav-bn\\|track-back\\)\">"
+	     "</div>[\t\n ]*"))))))
 
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-yomiuri)
 						   header)
   (shimbun-yomiuri-prepare-article shimbun header))
 
+(luna-define-method shimbun-clear-contents :around ((shimbun shimbun-yomiuri)
+						    header)
+  (when (luna-call-next-method)
+    (unless (shimbun-prefer-text-plain-internal shimbun)
+      (shimbun-break-long-japanese-lines))
+    t))
+
 (provide 'sb-yomiuri)
 
 ;;; sb-yomiuri.el ends here
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun: sb-zdnet-jp.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/sb-zeit-de.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-zeit-de.el
--- work/emacs-w3m-1.4.4/shimbun/sb-zeit-de.el	2005-03-24 09:43:32.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/sb-zeit-de.el	2010-11-04 13:32:04.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; sb-zeit-de.el --- shimbun backend for <http://www.zeit.de>
 
-;; Copyright (C) 2004, 2005 Andreas Seltenreich <seltenreich@gmx.de>
+;; Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010
+;; Andreas Seltenreich <seltenreich@gmx.de>
 
 ;; Author: Andreas Seltenreich <seltenreich@gmx.de>
 ;; Keywords: news
@@ -17,9 +18,15 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
+
+;; Macro used to extract groups from the overview-page
+;; (fset 'sb-zeit-de-macro [?\C-s ?d ?e ?/ ?\C-m ?\C-  ?\C-a ?\C-w ?\"
+;;			       ?\M-f ?\" ?\C-k ?\C-k ?\C-k return ?\C-k])
 
 ;;; Code:
 
@@ -29,13 +36,23 @@
 (luna-define-class shimbun-zeit-de (shimbun-rss) ())
 
 (defvar shimbun-zeit-de-groups
-  '("news"))
+  '("politik" "wirtschaft" "meinung" "gesellschaft" "kultur"
+    "wissen" "digital" "studium" "karriere" "lebensart" "reisen"
+    "auto" "sport" "blogs" "news"))
+
+(defvar shimbun-zeit-de-x-face-alist
+  '(("default" . "X-Face: +@u:6eD3Nq>u{P_Ev&\"A6eW=EA{5H[OqH;|oz7H>atafNFsUS-&7\
+%\\qo;KFS%E`=t5Z)'q~lhfl6<7rQ=]")))
+
+(defvar shimbun-zeit-de-content-start
+  "title\">\\|<!--content starts here-->\\(?:<table[^>]+>\\)?")
 
-(defvar shimbun-zeit-de-content-start "title\">")
 (defvar shimbun-zeit-de-content-end
   (concat
    "</body>\\|</html>\\|navigation[^><]*>[^A]\\|"
-   "<script language=\"JavaScript1\.2\" type=\"text/javascript\">"))
+   "<script language=\"JavaScript1\.2\" type=\"text/javascript\">\\|"
+   "<div[^>]+\\(class\\|id\\)=\"comments\\|<li class=\"bookmarks\\\|"
+   "class=\"com\"\\|class=\"toolad\""))
 
 (defvar shimbun-zeit-de-from-address "DieZeit@zeit.de")
 
@@ -46,24 +63,31 @@
 (luna-define-method shimbun-groups ((shimbun shimbun-zeit-de))
   shimbun-zeit-de-groups)
 
-(luna-define-method shimbun-rss-build-message-id
-  ((shimbun shimbun-zeit-de) url date)
-  (if (string-match "http://\\([^/]+\\)\\(/\\(.+\\)\\)?" url)
-      (let ((host (match-string-no-properties 1 url))
-	    (page (if (match-beginning 3)
-		      (shimbun-replace-in-string
-		       (match-string-no-properties 3 url)
-		       "[^a-zA-Z0-9]" "%")
-		    "top")))
-	(format "<%s@%s>" page host))
-    (error "Cannot find message-id base")))
+(luna-define-method shimbun-get-headers :around ((shimbun shimbun-zeit-de)
+						 &optional range)
+  (mapc
+   (lambda (header)
+     (let ((url (shimbun-header-xref header)))
+       ;; remove the "?from=rss" parameter
+       (when (string-match "\\(.*\\)\\?from=rss$" url)
+         (setq url (match-string 1 url)))
+       (cond ((string-match "\\`http://www\\.zeit\\.de" url)
+	      (shimbun-header-set-xref header (concat url "?page=all")))
+	     ((string-match "\\`/" url)
+	      (shimbun-header-set-xref
+	       header (concat "http://www.zeit.de" url))))))
+   (luna-call-next-method)))
 
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-zeit-de)
 						   header)
+  (when (re-search-forward "<script.*window.location='\\(.+?\\)';" nil t)
+    (let ((url (match-string 1)))
+      (erase-buffer)
+      (shimbun-retrieve-url (concat url "?page=all"))))
   (let* ((case-fold-search t)
-	 (start (re-search-forward shimbun-zeit-de-content-start nil t))
+	 (start (re-search-forward (shimbun-content-start shimbun) nil t))
 	 (end (and start
-		   (re-search-forward shimbun-zeit-de-content-end nil t)
+		   (re-search-forward (shimbun-content-end shimbun) nil t)
 		   (prog1
 		       (match-beginning 0)
 		     (goto-char start)))))
@@ -81,17 +105,25 @@
       (goto-char (point-min)))))
 
 (luna-define-method shimbun-index-url ((shimbun shimbun-zeit-de))
-  "http://newsfeed.zeit.de/")
+  (let ((group (shimbun-current-group shimbun)))
+    (if (equal "news" group)
+	"http://newsfeed.zeit.de/"
+      (concat "http://newsfeed.zeit.de/" group "/index"))))
 
 (luna-define-method shimbun-clear-contents :after ((shimbun shimbun-zeit-de)
-						    header)
+						   header)
 
   ;;  remove advertisements and 1-pixel-images aka webbugs
-  (shimbun-remove-tags "<a[^>]*doubleclick.net" "</a>")
+  (shimbun-remove-tags "<!--START: LESERMEINUNG-->" "<!--ENDE: LESERMEINUNG-->")
+  (shimbun-remove-tags "\\(div\\)\\(?:[\t\n\r ]+\\[^\t\n\r >]+\\)*[\t\n\r ]+\
+class=\"?\\(?:ad\\|most_read\\)" t)
+  (shimbun-remove-tags "\\(a\\)[\t\n\r ][^>]*doubleclick\\.net" t)
   (shimbun-remove-tags "<IFRAME[^>]*doubleclick.net[^>]*>")
   (shimbun-remove-tags "<img[^>]*doubleclick.net[^>]*>")
   (shimbun-remove-tags "<img[^>]*\\(width\\|height\\)=\"1px\"[^>]*>")
-  (shimbun-remove-tags "<tr><td[^>]*>Anzeige</td></tr>"))
+  (shimbun-remove-tags "<tr><td[^>]*>Anzeige</td></tr>")
+  (shimbun-remove-tags "\\(span\\) class=\"anzeige\"" t)
+  t)
 
 (provide 'sb-zeit-de)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/shimbun/shimbun.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/shimbun.el
--- work/emacs-w3m-1.4.4/shimbun/shimbun.el	2005-03-22 15:53:00.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/shimbun/shimbun.el	2013-05-09 08:55:13.000000000 +0900
@@ -1,11 +1,11 @@
 ;;; shimbun.el --- interfacing with web newspapers -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2001-2013 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;         Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
-;;         Yuuichi Teranishi  <teranisi@gohome.org>
+;;         Yuuichi Teranishi  <teranisi@gohome.org>,
+;;         Katsumi Yamaoka    <yamaoka@jpl.org>
 ;; Keywords: news
 
 ;; This file is the main part of shimbun.
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -77,6 +77,8 @@
 (require 'eword-encode)
 (require 'luna)
 (require 'std11)
+(require 'w3m)
+(require 'xml)
 
 (eval-and-compile
   (luna-define-class shimbun ()
@@ -84,7 +86,18 @@
 			  x-face x-face-alist
 			  url coding-system from-address
 			  content-start content-end
-			  expiration-days server-name))
+			  expiration-days server-name
+			  ;; Say whether to prefer text/plain articles.
+			  prefer-text-plain
+			  ;; Similar to `content-start' and `content-end'
+			  ;; but are used to extract html contents for
+			  ;; text/plain articles.
+			  text-content-start text-content-end
+			  ;; Say whether to convert Japanese zenkaku
+			  ;; ASCII chars into hankaku.
+			  japanese-hankaku
+			  ;; Number of times to retry fetching contents.
+			  retry-fetching))
   (luna-define-internal-accessors 'shimbun))
 
 (defgroup shimbun nil
@@ -123,6 +136,68 @@
   :group 'shimbun
   :type 'boolean)
 
+(defcustom shimbun-japanese-hankaku nil
+  "Non-nil means convert Japanese zenkaku ASCII chars into hankaku.
+A non-nil value of this variable affects all shimbun articles except
+ones fetched by shimbun modules that override the `shimbun-headers'
+method or the `shimbun-clear-contents' method.  Valid values include:
+
+`header' or `subject':
+    Perform the hankaku conversion on only subjects.
+`body':
+    Perform the hankaku conversion on only bodies.
+non-nil values excluding `header', `subject', `body', and `never':
+    Perform the hankaku conversion on both subjects and bodies.
+nil:
+    Don't perform the hankaku conversion.
+`never':
+    Never perform the hankaku conversion.
+
+Another way is to set `shimbun-SERVER-japanese-hankaku' to non-nil per
+SERVER.  If you want to perform the hankaku conversion on articles
+except ones fetched from SERVER for example, set this variable to t
+and set `shimbun-SERVER-japanese-hankaku' to `never'."
+  :group 'shimbun
+  :type '(radio
+	  (sexp :format "Header only\n" :value header
+		:match
+		(lambda (widget value)
+		  (memq value '(header subject))))
+	  (const :tag "Body only" body)
+	  (sexp :format "Header and Body\n" :value t
+		:match
+		(lambda (widget value)
+		  (and value (not (memq value '(header subject body never))))))
+	  (const :tag "Don't convert" nil)
+	  (const :tag "Never convert" never)))
+
+(defcustom shimbun-retry-fetching nil
+  "Number of times to retry fetching the web contents of a url.
+If it is a positive number and the fetching of the contents of a url
+fails, it will be retried until it is successful or until the number
+of times to retry reaches to that number.  Note that a non-nil value
+of `shimbun-SERVER-retry-fetching' overrides this variable."
+  :group 'shimbun
+  :type '(radio (const :format "Don't retry " nil)
+		(integer :tag "Number of retries"
+			 :match (lambda (widget value) (natnump value))
+			 :value 1)))
+
+(defcustom shimbun-use-local nil
+  "Specifies if local files should be used (\"offline\" mode).
+This way, you can use an external script to retrieve the
+necessary HTML/XML files.  For an example, see
+`nnshimbun-generate-download-script'.  If a local file for an URL
+cannot be found, it will silently be retrieved as usual."
+  :group 'shimbun
+  :type 'boolean)
+
+(defcustom shimbun-local-path w3m-default-save-directory
+  "Directory where local shimbun files are stored.
+Default is the value of `w3m-default-save-directory'."
+  :group 'shimbun
+  :type 'directory)
+
 (defun shimbun-servers-list ()
   "Return a list of shimbun servers."
   (let (servers)
@@ -133,7 +208,8 @@
 	  (and (string-match "\\`sb-\\(.*\\)\\.elc?\\'" file)
 	       (not (member (setq file (match-string 1 file))
 			    '("fml" "glimpse" "lump" "mailarc"
-			      "mailman" "mhonarc" "rss" "text")))
+			      "mailman" "mhonarc" "text" "hash"
+			      "rss" "atom" "multi")))
 	       (not (member file servers))
 	       (push file servers)))))
     (sort servers 'string-lessp)))
@@ -154,47 +230,90 @@
   "Return the shimbun object created by MUA."
   (shimbun-mua-shimbun-internal mua))
 
-;;; BASE 64
-(require 'mel)
-(eval-and-compile
-  (fset 'shimbun-base64-encode-string
-	(mel-find-function 'mime-encode-string "base64")))
-
 ;;; emacs-w3m implementation of url retrieval and entity decoding.
-(require 'w3m)
+(defalias 'shimbun-beginning-of-tag 'w3m-beginning-of-tag)
+(defalias 'shimbun-decode-anchor-string 'w3m-decode-anchor-string)
+(defalias 'shimbun-decode-entities 'w3m-decode-entities)
+(defalias 'shimbun-decode-entities-string 'w3m-decode-entities-string)
+(defalias 'shimbun-end-of-tag 'w3m-end-of-tag)
+(defalias 'shimbun-expand-url 'w3m-expand-url)
+(defalias 'shimbun-find-coding-system 'w3m-find-coding-system)
+(defalias 'shimbun-flet 'w3m-flet)
+(defalias 'shimbun-interactive-p 'w3m-interactive-p)
+(defalias 'shimbun-replace-in-string 'w3m-replace-in-string)
+(defalias 'shimbun-url-encode-string 'w3m-url-encode-string)
+
 (defun shimbun-retrieve-url (url &optional no-cache no-decode referer)
   "Rertrieve URL contents and insert to current buffer.
 Return content-type of URL as string when retrieval succeeded."
-  (let (type)
-    (when (and url (setq type (w3m-retrieve url nil no-cache nil referer)))
+  (let (type charset fname)
+    (if (and url
+	     shimbun-use-local
+	     shimbun-local-path
+	     (file-regular-p
+	      (setq fname (concat (file-name-as-directory
+				   (expand-file-name shimbun-local-path))
+				  (substring (md5 url) 0 10)
+				  "_shimbun"))))
+	;; get local file contents
+	(progn
+	  (let ((coding-system-for-read 'no-conversion))
+	    (insert-file-contents fname))
+	  (when (re-search-forward "^$" nil t)
+	    (let ((pos (match-beginning 0)))
+	      (re-search-backward
+	       "^Content-Type: \\(.*?\\)\\(?:[ ;]+\\|$\\)\\(charset=\\(.*\\)\\)?"
+	       nil t)
+	      (setq type (match-string 1)
+		    charset (match-string 3))
+	      (delete-region (point-min) pos))))
+      ;; retrieve URL
+      (when url
+	(setq type (w3m-retrieve (w3m-url-transfer-encode-string url)
+				 nil no-cache nil referer))))
+    (if type
+	(progn
+	  (unless no-decode
+	    (if charset
+		(w3m-decode-buffer url charset type)
+	      (w3m-decode-buffer url))
+	    (goto-char (point-min)))
+	  type)
       (unless no-decode
-	(w3m-decode-buffer url)
-	(goto-char (point-min)))
-      type)))
+	(set-buffer-multibyte t)
+	nil))))
+
+(luna-define-generic shimbun-retry-fetching (shimbun)
+  "Return the number of times to retry fetching the web contents of a url.")
+
+(luna-define-method shimbun-retry-fetching ((shimbun shimbun))
+  (or (shimbun-retry-fetching-internal shimbun)
+      shimbun-retry-fetching))
 
 (defun shimbun-fetch-url (shimbun url &optional no-cache no-decode referer)
-  "Retrieve contents specified by URL for SHIMBUN.
-This function is exacly similar to `shimbun-retrieve-url', but
-considers the `coding-system' slot of SHIMBUN when estimating a coding
-system of retrieved contents."
-  (if (shimbun-coding-system-internal shimbun)
-      (let ((w3m-coding-system-priority-list
-	     (cons (shimbun-coding-system-internal shimbun)
-		   w3m-coding-system-priority-list)))
-	(inline
-	  (shimbun-retrieve-url url no-cache no-decode referer)))
-    (inline
-      (shimbun-retrieve-url url no-cache no-decode referer))))
+  "Retrieve contents specified by URL for SHIMBUN."
+  (let ((retry (shimbun-retry-fetching shimbun)))
+    (save-restriction
+      (narrow-to-region (point) (point))
+      (or (shimbun-retrieve-url url no-cache no-decode referer)
+	  (and retry
+	       (let (retval)
+		 (shimbun-message
+		  shimbun "shimbun: Retrying to fetch contents...")
+		 (while (and (> retry 0) (not retval))
+		   (delete-region (point-min) (point-max))
+		   (setq retval (shimbun-retrieve-url
+				 url no-cache no-decode referer)
+			 retry (1- retry)))
+		 (shimbun-message shimbun
+				  "shimbun: Retrying to fetch contents...%s"
+				  (if retval "done" "failed"))
+		 retval))))))
 
 (defun shimbun-real-url (url &optional no-cache)
   "Return a real URL."
   (w3m-real-url url no-cache))
 
-(defalias 'shimbun-decode-entities 'w3m-decode-entities)
-(defalias 'shimbun-expand-url 'w3m-expand-url)
-(defalias 'shimbun-find-coding-system 'w3m-find-coding-system)
-(defalias 'shimbun-url-encode-string 'w3m-url-encode-string)
-
 ;;; Implementation of Header API.
 (eval-and-compile
   (luna-define-class shimbun-header ()
@@ -214,7 +333,7 @@
     (shimbun-mime-encode-string
      (shimbun-header-subject-internal header))))
 
-(defsubst shimbun-header-normalize (string &optional keep-angle-brackets)
+(defun shimbun-header-normalize (string &optional keep-angle-brackets)
   (when string
     (save-match-data
       ;; This is a trick to keep backward compatibility for
@@ -324,16 +443,15 @@
 If optional 11th argument ASIS is non-nil, normalization of header
 values is suppressed."
   (let ((new (luna-make-entity 'shimbun-header :number number)))
-    (inline
-      (shimbun-header-set-subject new subject asis)
-      (shimbun-header-set-from new from asis)
-      (shimbun-header-set-date new date asis)
-      (shimbun-header-set-id new id asis)
-      (shimbun-header-set-references new references asis)
-      (shimbun-header-set-chars new chars)
-      (shimbun-header-set-lines new lines)
-      (shimbun-header-set-xref new xref)
-      (shimbun-header-set-extra new extra))
+    (shimbun-header-set-subject new subject asis)
+    (shimbun-header-set-from new from asis)
+    (shimbun-header-set-date new date asis)
+    (shimbun-header-set-id new id asis)
+    (shimbun-header-set-references new references asis)
+    (shimbun-header-set-chars new chars)
+    (shimbun-header-set-lines new lines)
+    (shimbun-header-set-xref new xref)
+    (shimbun-header-set-extra new extra)
     new))
 
 (defun shimbun-make-header (&optional number subject from date id
@@ -347,8 +465,8 @@
 			 (and from (eword-decode-string from))
 			 date id references chars lines xref extra t))
 
-;; Inline functions for the internal use.
-(defsubst shimbun-article-base-url (shimbun header)
+;; Functions for the internal use.
+(defun shimbun-article-base-url (shimbun header)
   "Return URL which points the original page specified by HEADER for SHIMBUN."
   (let ((xref (shimbun-header-xref header)))
     (if (and xref (eq (aref xref 0) ?/))
@@ -424,7 +542,7 @@
    (when (string= "multipart/related" (shimbun-entity-type-internal entity))
      (catch 'start
        (dolist (child (shimbun-entity-data-internal entity))
-	 (when (string-match "\\`\\(text/\\|multipart/mixed\\)"
+	 (when (string-match "\\`\\(?:text/\\|multipart/mixed\\)"
 			     (shimbun-entity-type child))
 	   (throw 'start
 		  (concat "; type=\""
@@ -462,16 +580,33 @@
   "Return MIME charset of ENTITY.")
 (luna-define-method shimbun-text-entity-charset ((entity shimbun-text-entity)
 						 &optional begin end)
-  (or (shimbun-text-entity-charset-internal entity)
-      (shimbun-text-entity-set-charset-internal
-       entity
-       (upcase
-	(symbol-name
-	 (if (and begin end)
-	     (detect-mime-charset-region begin end)
-	   (with-temp-buffer
-	     (insert (shimbun-entity-data-internal entity))
-	     (detect-mime-charset-region (point-min) (point-max)))))))))
+  (let (cur tmp)
+    (unless (and begin end)
+      (setq cur (current-buffer))
+      (set-buffer (generate-new-buffer " *temp*"))
+      (insert (shimbun-entity-data-internal entity))
+      (setq begin (point-min)
+	    end (point-max)
+	    tmp (current-buffer)))
+    (prog1
+	;; Prefer meta charset.
+	(or (let ((charset (progn
+			     (goto-char begin)
+			     (and (re-search-forward "\
+<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
+text/\\sw+\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" end t)
+				  (match-string 1)))))
+	      (when (and charset
+			 (w3m-find-coding-system (intern (downcase charset))))
+		(shimbun-text-entity-set-charset-internal entity
+							  (upcase charset))))
+	    (shimbun-text-entity-charset-internal entity)
+	    (shimbun-text-entity-set-charset-internal
+	     entity (upcase (symbol-name
+			     (detect-mime-charset-region begin end)))))
+      (when cur
+	(set-buffer cur)
+	(kill-buffer tmp)))))
 
 (luna-define-method shimbun-entity-type ((entity shimbun-text-entity))
   (concat (shimbun-entity-type-internal entity)
@@ -509,10 +644,10 @@
 	  "Content-Disposition: "
 	  (shimbun-image-entity-disposition-internal entity) "\n")
   (luna-call-next-method)
-  (insert
-   (shimbun-base64-encode-string (shimbun-entity-data-internal entity))))
+  (insert (base64-encode-string (shimbun-entity-data-internal entity))))
 
-(defun shimbun-mime-replace-image-tags (base-cid &optional base-url images)
+(defun shimbun-mime-replace-image-tags (shimbun base-cid
+						&optional base-url images)
   "Replace all IMG tags with references to inlined image parts.
 This function takes a BASE-CID as a base string for CIDs of inlined
 image parts, and returns an alist of URLs and image entities."
@@ -532,28 +667,44 @@
 		       (concat "[" spc "]+"
 			       ;; 1. replaceable part
 			       "\\(src[" spc "]*=[" spc "]*"
-			       "\\(\""
-			       ;; 3. url quoted with \"
+			       "\\(?:\""
+			       ;; 2. url quoted with \"
 			       "\\([^\"]+\\)"
 			       "\"\\|'"
-			       ;; 4. url quoted with '
+			       ;; 3. url quoted with '
 			       "\\([^']+\\)"
 			       "'\\|"
-			       ;; 5. url unquoted
+			       ;; 4. url unquoted
 			       "\\([^" spc "\"']+\\)"
 			       "\\)\\)")))
 		   end t)))
       (setq start (match-beginning 1)
 	    end (match-end 1)
-	    url (shimbun-expand-url (or (match-string 3)
-					(match-string 4)
-					(match-string 5))
-				    base-url))
-      (unless (setq img (assoc url images))
+	    url (or (match-string 2) (match-string 3) (match-string 4)))
+      (setq url (shimbun-expand-url
+		 ;; See the FIXME comment within the function definition
+		 ;; of `w3m-decode-anchor-string' in w3m.el.
+		 (shimbun-decode-anchor-string
+		  (if (string-match "[\t\n\f\r ]+\\'" url)
+		      (substring url 0 (match-beginning 0))
+		    url))
+		 base-url))
+      (unless (or (setq img (assoc url images))
+		  (and w3m-ignored-image-url-regexp
+		       (string-match w3m-ignored-image-url-regexp url)))
 	(with-temp-buffer
 	  (set-buffer-multibyte nil)
-	  (setq type (shimbun-retrieve-url url nil t base-url))
-	  (when (and type (string-match "\\`image/" type))
+	  (setq case-fold-search nil
+		type (shimbun-fetch-url shimbun url nil t base-url))
+	  (goto-char (point-min))
+	  (when (or (and (looking-at
+			  "\\(GIF8\\)\\|\\(\377\330\\)\\|\211PNG\r\n")
+			 (setq type (concat "image/"
+					    (cond ((match-beginning 1) "gif")
+						  ((match-beginning 2) "jpeg")
+						  (t "png")))))
+		    (and type
+			 (string-match "\\`image/" type)))
 	    (push (setq img (cons url
 				  (shimbun-make-image-entity
 				   type
@@ -569,7 +720,7 @@
 	(insert "src=\"cid:" (shimbun-entity-cid (cdr img)) "\""))))
   images)
 
-(defun shimbun-make-mime-article (shimbun header)
+(defun shimbun-make-mime-article (shimbun header &optional base-url)
   "Make a MIME article according to SHIMBUN and HEADER.
 If article have inline images, generated article have a multipart/related
 content-type if `shimbun-encapsulate-images' is non-nil."
@@ -578,9 +729,11 @@
       (setq base-cid (match-string 1 base-cid)))
     (when shimbun-encapsulate-images
       (setq images
-	    (shimbun-mime-replace-image-tags base-cid
-					     (shimbun-article-url shimbun
-								  header))))
+	    (shimbun-mime-replace-image-tags shimbun
+					     base-cid
+					     (or base-url
+						 (shimbun-article-url
+						  shimbun header)))))
     (let ((body (shimbun-make-text-entity "text/html" (buffer-string))))
       (erase-buffer)
       (when images
@@ -614,13 +767,14 @@
   (let ((from (shimbun-header-from header))
 	(refs (shimbun-header-references header))
 	(reply-to (shimbun-reply-to shimbun))
-	x-face
-	;; Make sure the temp buffer's multibyteness is true.  It is
-	;; needed to make `encode-mime-charset-string' (which is
-	;; employed by `eword-encode-string') encode non-ascii text.
-	(default-enable-multibyte-characters t))
+	x-face)
     (insert
      (with-temp-buffer
+       ;; Make sure the temp buffer's multibyteness is true.  It is
+       ;; needed to make `encode-mime-charset-string' (which is
+       ;; employed by `eword-encode-string') encode non-ascii text.
+       (static-unless (featurep 'xemacs)
+	 (set-buffer-multibyte t))
        (insert "Subject: " (or (eword-encode-string
 				(shimbun-header-subject header t))
 			       "(none)")
@@ -709,31 +863,35 @@
 
 (defconst shimbun-attributes
   '(url groups coding-system server-name from-address
-	content-start content-end x-face-alist expiration-days))
+	content-start content-end x-face-alist expiration-days
+	prefer-text-plain text-content-start text-content-end
+	japanese-hankaku retry-fetching))
 
 (defun shimbun-open (server &optional mua)
   "Open a shimbun for SERVER.
 Optional MUA is a `shimbun-mua' instance."
-  (let ((load-path (append shimbun-server-additional-path load-path)))
-    (require (intern (concat "sb-" server))))
-  (let (url groups coding-system server-name from-address
-	    content-start content-end x-face-alist shimbun expiration-days)
-    (dolist (attr shimbun-attributes)
-      (set attr
-	   (symbol-value (intern-soft
-			  (concat "shimbun-" server "-" (symbol-name attr))))))
-    (setq shimbun (luna-make-entity (intern (concat "shimbun-" server))
-				    :mua mua
-				    :server server
-				    :server-name server-name
-				    :url url
-				    :groups groups
-				    :coding-system coding-system
-				    :from-address from-address
-				    :content-start content-start
-				    :content-end content-end
-				    :expiration-days expiration-days
-				    :x-face-alist x-face-alist))
+  (let ((load-path (append shimbun-server-additional-path load-path))
+	rest subst shimbun)
+    (require (intern (concat "sb-" server)))
+    (setq shimbun
+	  (apply
+	   'luna-make-entity (intern (concat "shimbun-" server))
+	   :mua mua :server server
+	   (dolist (attr shimbun-attributes (nreverse rest))
+	     (push (intern (format ":%s" attr)) rest)
+	     (push (if (setq subst (assq attr
+					 '((content-start . text-content-start)
+					   (content-end . text-content-end)
+					   (text-content-start . content-start)
+					   (text-content-end . content-end))))
+		       (or (symbol-value (intern-soft (format "shimbun-%s-%s"
+							      server attr)))
+			   (symbol-value (intern-soft (format "shimbun-%s-%s"
+							      server
+							      (cdr subst)))))
+		     (symbol-value (intern-soft (format "shimbun-%s-%s"
+							server attr))))
+		   rest))))
     (when mua
       (shimbun-mua-set-shimbun-internal mua shimbun))
     shimbun))
@@ -782,6 +940,15 @@
   (when (shimbun-current-group-internal shimbun)
     (shimbun-set-current-group-internal shimbun nil)))
 
+(luna-define-generic shimbun-japanese-hankaku (shimbun)
+  "Say whether to convert Japanese zenkaku ASCII chars into hankaku.")
+
+(luna-define-method shimbun-japanese-hankaku ((shimbun shimbun))
+  (let ((hankaku (or (shimbun-japanese-hankaku-internal shimbun)
+		     shimbun-japanese-hankaku)))
+    (unless (eq hankaku 'never)
+      hankaku)))
+
 (luna-define-generic shimbun-headers (shimbun &optional range)
   "Return a SHIMBUN header list.
 Optional argument RANGE is one of following:
@@ -792,17 +959,52 @@
 (defmacro shimbun-header-index-pages (range)
   "Return number of pages to retrieve according to RANGE.
 Return nil if all pages should be retrieved."
-  (` (if (eq 'last (, range)) 1
-       (if (eq 'all (, range)) nil
-	 (, range)))))
+  (if (consp range)
+      `(let ((range ,range))
+	 (if (eq 'last range) 1
+	   (if (eq 'all range) nil
+	     range)))
+    `(if (eq 'last ,range) 1
+       (if (eq 'all ,range) nil
+	 ,range))))
+
+(defvar shimbun-use-refresh t
+  "Non-nil means honor the REFRESH attribute in META tags.
+Bind it to nil per shimbun if the refresh brings unwanted page.")
+
+;; FIXME: It seems better that `shimbun-fetch-url' provides the redirection
+;; support, whereas it is currently done by `shimbun-headers-1' for headers
+;; and `shimbun-article-1' for articles separately.  The reason doing so is
+;; that `shimbun-article-1' needs to replace urls in XREFs with the redirected
+;; ones.
+(defun shimbun-headers-1 (shimbun url)
+  "Run `shimbun-fetch-url' and refresh the contents if necessary."
+  (let (;; The default url used when it is not specified for refresh.
+	(w3m-current-url url)
+	(w3m-use-refresh shimbun-use-refresh))
+    (when (and (shimbun-fetch-url shimbun url 'reload)
+	       (progn
+		 (w3m-check-refresh-attribute)
+		 (and w3m-current-refresh
+		      (not (string-equal url (cdr w3m-current-refresh))))))
+      (erase-buffer)
+      (shimbun-headers-1 shimbun (cdr w3m-current-refresh)))))
 
 (luna-define-method shimbun-headers ((shimbun shimbun) &optional range)
   (shimbun-message shimbun (concat shimbun-checking-new-news-format "..."))
   (prog1
       (with-temp-buffer
-	(let ((w3m-verbose (if shimbun-verbose nil w3m-verbose)))
-	  (shimbun-fetch-url shimbun (shimbun-index-url shimbun) 'reload)
-	  (shimbun-get-headers shimbun range)))
+	(let ((w3m-verbose (if shimbun-verbose nil w3m-verbose))
+	      headers)
+	  (shimbun-headers-1 shimbun (shimbun-index-url shimbun))
+	  (setq headers (shimbun-get-headers shimbun range))
+	  (if (memq (shimbun-japanese-hankaku shimbun) '(body nil))
+	      headers
+	    (dolist (header headers headers)
+	      (erase-buffer)
+	      (insert (shimbun-header-subject-internal header))
+	      (shimbun-japanese-hankaku-buffer)
+	      (shimbun-header-set-subject-internal header (buffer-string))))))
     (shimbun-message shimbun (concat shimbun-checking-new-news-format
 				     "...done"))))
 
@@ -818,10 +1020,16 @@
 (luna-define-method shimbun-x-face ((shimbun shimbun))
   (shimbun-set-x-face-internal
    shimbun
-   (or (cdr (assoc (shimbun-current-group-internal shimbun)
-		   (shimbun-x-face-alist-internal shimbun)))
-       (cdr (assoc "default" (shimbun-x-face-alist-internal shimbun)))
-       shimbun-x-face)))
+   (let ((group (shimbun-current-group-internal shimbun))
+	 (alist (shimbun-x-face-alist-internal shimbun)))
+     (or (cdr (assoc group alist))
+	 (catch 'face
+	   (dolist (elem alist)
+	     (when (and (string-match "[]$*+\\^[]" (car elem))
+			(string-match (car elem) group))
+	       (throw 'face (cdr elem)))))
+	 (cdr (assoc "default" alist))
+	 shimbun-x-face))))
 
 (defun shimbun-search-id (shimbun id)
   "Return non-nil when MUA found a message structure which corresponds to ID."
@@ -833,30 +1041,69 @@
 Return nil when articles are not expired."
   (shimbun-expiration-days-internal shimbun))
 
+(defun shimbun-content-start (shimbun)
+  "Return the `content-start' value according to SHIMBUN."
+  (if (shimbun-prefer-text-plain-internal shimbun)
+      (or (shimbun-text-content-start-internal shimbun)
+	  (shimbun-content-start-internal shimbun))
+    (or (shimbun-content-start-internal shimbun)
+	(shimbun-text-content-start-internal shimbun))))
+
+(defun shimbun-content-end (shimbun)
+  "Return the `content-end' value according to SHIMBUN."
+  (if (shimbun-prefer-text-plain-internal shimbun)
+      (or (shimbun-text-content-end-internal shimbun)
+	  (shimbun-content-end-internal shimbun))
+    (or (shimbun-content-end-internal shimbun)
+	(shimbun-text-content-end-internal shimbun))))
+
 (luna-define-generic shimbun-from-address (shimbun)
   "Make a From address like \"SERVER (GROUP) <ADDRESS>\".")
 
 (luna-define-method shimbun-from-address ((shimbun shimbun))
-  (format "%s (%s) <%s>"
-	  (shimbun-server-name shimbun)
-	  (shimbun-current-group-name shimbun)
-	  (or (shimbun-from-address-internal shimbun)
-	      (shimbun-reply-to shimbun))))
+  (let ((addr (or (shimbun-from-address-internal shimbun)
+		  (shimbun-reply-to shimbun))))
+    (if addr
+	(format "%s (%s) <%s>"
+		(shimbun-server-name shimbun)
+		(shimbun-current-group-name shimbun)
+		addr)
+      (format "%s (%s)"
+	      (shimbun-server-name shimbun)
+	      (shimbun-current-group-name shimbun)))))
 
 (luna-define-generic shimbun-article (shimbun header &optional outbuf)
   "Retrieve a SHIMBUN article which corresponds to HEADER to the OUTBUF.
 HEADER is a shimbun-header which is obtained by `shimbun-headers'.
 If OUTBUF is not specified, article is retrieved to the current buffer.")
 
+;; See also the FIXME comment around `shimbun-headers-1'.
+(defun shimbun-article-1 (shimbun header)
+  "Run `shimbun-fetch-url' and refresh the contents if necessary."
+  (let* ((url (shimbun-article-url shimbun header))
+	 ;; The default url used when it is not specified for refresh.
+	 (w3m-current-url url)
+	 (w3m-use-refresh shimbun-use-refresh)
+	 real)
+    (when (shimbun-fetch-url shimbun url nil nil
+			     (shimbun-article-base-url shimbun header))
+      (w3m-check-refresh-attribute)
+      (if (and w3m-current-refresh
+	       ;; The page may specify to refresh itself.
+	       (not (string-equal url (cdr w3m-current-refresh))))
+	  (progn
+	    (shimbun-header-set-xref header (cdr w3m-current-refresh))
+	    (erase-buffer)
+	    (shimbun-article-1 shimbun header))
+	(unless (string-equal url (setq real (w3m-real-url url)))
+	  (shimbun-header-set-xref header real))))))
+
 (luna-define-method shimbun-article ((shimbun shimbun) header &optional outbuf)
   (when (shimbun-current-group-internal shimbun)
     (with-current-buffer (or outbuf (current-buffer))
       (w3m-insert-string
        (or (with-temp-buffer
-	     (shimbun-fetch-url shimbun
-				(shimbun-article-url shimbun header)
-				nil nil
-				(shimbun-article-base-url shimbun header))
+	     (shimbun-article-1 shimbun header)
 	     (shimbun-message shimbun "shimbun: Make contents...")
 	     (goto-char (point-min))
 	     (prog1 (shimbun-make-contents shimbun header)
@@ -867,37 +1114,75 @@
   "Return a content string of SHIMBUN article using current buffer content.
 HEADER is a header structure obtained via `shimbun-headers'.")
 
-(defsubst shimbun-make-html-contents (shimbun header)
-  (when (shimbun-clear-contents shimbun header)
+(defun shimbun-insert-footer (shimbun header &optional html &rest args)
+  "Insert the footer and ARGS."
+  ;; Remove <p> and </p> from the last paragraph in order to prevent
+  ;; an empty line from being inserted at the end.
+  (goto-char (point-min))
+  (when (re-search-forward "[\t\n ]*<p>[\t\n ]*\\([^<]+\\)</p>[\t\n ]*\
+\\(?:<\\(?:![^>]+\\|/?div\\|/?p\\)>[\t\n ]*\\)*\\'" nil t)
+    (replace-match "\n\\1"))
+  (goto-char (point-min))
+  (when (re-search-forward
+	 "[\t\n ]*\\(?:<\\(?:![^>]+\\|br\\|div\\)>[\t\n ]*\\)*\\'"
+	 nil 'move)
+    (delete-region (match-beginning 0) (point-max)))
+  (apply 'insert "\n" (shimbun-footer shimbun header html) args))
+
+(defun shimbun-current-base-url ()
+  "Process BASE tag in the current buffer."
+  (let ((case-fold-search t))
     (goto-char (point-min))
-    (insert "<html>\n<head>\n<base href=\""
-	    (shimbun-article-url shimbun header)
-	    "\">\n</head>\n<body>\n")
-    (goto-char (point-max))
-    (insert (shimbun-footer shimbun header t)
-	    "\n</body>\n</html>\n"))
-  (shimbun-make-mime-article shimbun header)
-  (buffer-string))
+    (when (re-search-forward "</head\\(?:[ \t\r\f\n][^>]*\\)?>" nil t)
+      (save-restriction
+	(narrow-to-region (point-min) (point))
+	(goto-char (point-min))
+	(when (re-search-forward "<base[ \t\r\f\n]+" nil t)
+	  (w3m-parse-attributes (href)
+	    (when (< 0 (length href))
+	      href)))))))
+
+(defun shimbun-make-html-contents (shimbun header)
+  (let ((base-url (or (shimbun-current-base-url)
+		      (file-name-directory
+		       (shimbun-article-url shimbun header)))))
+    (when (shimbun-clear-contents shimbun header)
+      (goto-char (point-min))
+      (insert "<html>\n<head>\n<base href=\""
+	      base-url
+	      "\">\n</head>\n<body>\n")
+      (shimbun-insert-footer shimbun header t "</body>\n</html>\n"))
+    (shimbun-make-mime-article shimbun header base-url)
+    (buffer-string)))
+
+(eval-and-compile
+  (autoload 'shimbun-make-text-contents "sb-text"))
 
 (luna-define-method shimbun-make-contents ((shimbun shimbun) header)
-  (shimbun-make-html-contents shimbun header))
+  (if (shimbun-prefer-text-plain-internal shimbun)
+      (shimbun-make-text-contents shimbun header)
+    (shimbun-make-html-contents shimbun header)))
 
 (luna-define-generic shimbun-clear-contents (shimbun header)
   "Clear a content in this current buffer for an article of SHIMBUN.
 Return nil, unless a content is cleared successfully.")
 
 (luna-define-method shimbun-clear-contents ((shimbun shimbun) header)
-  (let ((case-fold-search t) start)
+  (let ((start (shimbun-content-start shimbun))
+	(end (shimbun-content-end shimbun))
+	(case-fold-search t))
     (goto-char (point-min))
-    (when (and (stringp (shimbun-content-start-internal shimbun))
-	       (re-search-forward (shimbun-content-start-internal shimbun)
-				  nil t)
-	       (setq start (point))
-	       (stringp (shimbun-content-end-internal shimbun))
-	       (re-search-forward (shimbun-content-end-internal shimbun)
-				  nil t))
+    (when (and (stringp start)
+	       (re-search-forward start nil t)
+	       (progn
+		 (setq start (point))
+		 (stringp end))
+	       (re-search-forward end nil t))
       (delete-region (match-beginning 0) (point-max))
       (delete-region (point-min) start)
+      (unless (memq (shimbun-japanese-hankaku shimbun) '(header subject nil))
+	(shimbun-japanese-hankaku-buffer t)
+	(goto-char (point-min)))
       t)))
 
 (luna-define-generic shimbun-footer (shimbun header &optional html)
@@ -926,86 +1211,80 @@
 (luna-define-method shimbun-close ((shimbun shimbun))
   (shimbun-close-group shimbun))
 
+;;; Virtual class for Newspapers:
+(luna-define-class shimbun-newspaper () ())
+(luna-define-method shimbun-footer ((shimbun shimbun-newspaper) header
+				    &optional html)
+  (if html
+      (concat "<div align=\"left\">\n--&nbsp;<br>\n<i>"
+	      (shimbun-server-name shimbun)
+	      " holds the copyright of this article.<br>\n"
+	      "The original article is <a href=\""
+	      (shimbun-article-base-url shimbun header) "\">"
+	      "here</a>.\n</i></div>\n")
+    (concat "-- \n"
+	    (shimbun-server-name shimbun)
+	    " holds the the copyright of this article.\n"
+	    "The original article is in:\n"
+	    (shimbun-article-base-url shimbun header)
+	    "\n")))
+
 ;;; Virtual class for Japanese Newspapers:
 (luna-define-class shimbun-japanese-newspaper () ())
 (luna-define-method shimbun-footer ((shimbun shimbun-japanese-newspaper) header
 				    &optional html)
   (if html
-      (concat "\n<p align=\"left\">\n-- <br>\nこの記事の著作権は、"
+      (concat "<div align=\"left\">\n--&nbsp;<br>\nこの記事の著作権は、"
 	      (shimbun-server-name shimbun)
 	      "社に帰属します。<br>\n原物は <a href=\""
 	      (shimbun-article-base-url shimbun header) "\">"
 	      (shimbun-article-base-url shimbun header)
-	      "</a> で公開されています。\n</p>\n")
-    (concat "\n-- \nこの記事の著作権は、"
+	      "</a> で公開されています。\n</div>\n")
+    (concat "-- \nこの記事の著作権は、"
 	    (shimbun-server-name shimbun)
 	    "社に帰属します。\n原物は "
 	    (shimbun-article-base-url shimbun header)
 	    " で公開されています。\n")))
 
 ;;; Misc Functions
-(static-cond
- ((fboundp 'point-at-bol)
-  (defalias 'shimbun-point-at-bol 'point-at-bol))
- ((fboundp 'line-beginning-position)
-  (defalias 'shimbun-point-at-bol 'line-beginning-position))
- (t
-  (defun shimbun-point-at-bol ()
-    "Return point at the beginning of the line."
-    (let ((p (point)))
-      (beginning-of-line)
-      (prog1 (point)
-	(goto-char p))))))
-
-(static-cond
- ((fboundp 'point-at-eol)
-  (defalias 'shimbun-point-at-eol 'point-at-eol))
- ((fboundp 'line-end-position)
-  (defalias 'shimbun-point-at-eol 'line-end-position))
- (t
-  (defun shimbun-point-at-eol ()
-    "Return point at the end of the line."
-    (let ((p (point)))
-      (end-of-line)
-      (prog1 (point)
-	(goto-char p))))))
-
 (defun shimbun-header-insert-and-buffer-string (shimbun header
 							&optional charset html)
-  "Insert headers which are generated from SHIMBUN and HEADER, and
-return the contents of this buffer as an encoded string."
+  "Insert headers and footer in the current buffer and return the contents.
+SHIMBUN and HEADER specify what headers and footer are.  CHARSET, which
+defaults to the one that the `detect-mime-charset-region' function
+determines, specifies the content charset and is used to encode
+the return value of this function.  A non-nil value of HTML specifies
+that the content type is text/html, otherwise text/plain."
   (unless charset
-    (setq charset "ISO-2022-JP"))
+    (setq charset (upcase (symbol-name (detect-mime-charset-region
+					(point-min) (point-max))))))
   (goto-char (point-min))
   (shimbun-header-insert shimbun header)
   (insert "Content-Type: text/" (if html "html" "plain") "; charset=" charset
 	  "\nMIME-Version: 1.0\n\n")
   (if html
       (progn
-	(insert "<html><head><base href=\""
-		(shimbun-article-url shimbun header)
-		"\"></head><body>")
-	(goto-char (point-max))
-	(insert (shimbun-footer shimbun header html)
-		"\n</body></html>"))
-    (goto-char (point-max))
-    (insert (shimbun-footer shimbun header html)))
-  (encode-coding-string (buffer-string)
-			(mime-charset-to-coding-system charset)))
+	(insert "<html>\n<head>\n<base href=\""
+		(file-name-directory (shimbun-article-url shimbun header))
+		"\">\n</head>\n<body>\n")
+	(shimbun-insert-footer shimbun header t "</body>\n</html>\n"))
+    (shimbun-insert-footer shimbun header))
+  (encode-mime-charset-string (buffer-string) charset))
 
 (defun shimbun-mime-encode-string (string)
   (condition-case nil
       (save-match-data
-	;; Make sure the temp buffer's multibyteness is true.  It is
-	;; needed to make `encode-mime-charset-string' (which is
-	;; employed by `eword-encode-string') encode non-ascii text.
-	(let ((default-enable-multibyte-characters t))
-	  (with-temp-buffer
-	    (mapconcat
-	     #'identity
-	     (split-string (or (eword-encode-string
-				(shimbun-decode-entities-string string)) ""))
-	     " "))))
+	(with-temp-buffer
+	  ;; Make sure the temp buffer's multibyteness is true.  It is
+	  ;; needed to make `encode-mime-charset-string' (which is
+	  ;; employed by `eword-encode-string') encode non-ascii text.
+	  (static-unless (featurep 'xemacs)
+	    (set-buffer-multibyte t))
+	  (mapconcat
+	   #'identity
+	   (split-string (or (eword-encode-string
+			      (shimbun-decode-entities-string string)) ""))
+	   " ")))
     (error string)))
 
 (defun shimbun-make-date-string (year month day &optional time timezone)
@@ -1041,6 +1320,29 @@
   (let ((x (nreverse (append (timezone-fix-time string nil nil) nil))))
     (apply 'encode-time (nconc (cdr x) (list (car x))))))
 
+(defun shimbun-decode-time (&optional specified-time specified-zone)
+  "Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).
+This function behaves as well as `decode-time' if the optional 2nd arg
+SPECIFIED-ZONE is nil.  If it is an integer indicating the number of
+seconds ahead of UTC (east of Greenwich), the return value expresses
+the local time of the zone that the value indicates.  For instance,
+the following form returns the present time of Japan, wherever you are.
+
+\(shimbun-decode-time nil 32400)"
+  (if specified-zone
+      (let* ((tz (- (car (current-time-zone)) specified-zone))
+	     (ct (or specified-time (current-time)))
+	     (ms (car ct))
+	     (ls (- (cadr ct) tz)))
+	(cond ((< ls 0)
+	       (setq ls (+ ls 65536)
+		     ms (1- ms)))
+	      ((>= ls 65536)
+	       (setq ls (- ls 65536)
+		     ms (1+ ms))))
+	(nconc (nbutlast (decode-time (list ms ls))) (list specified-zone)))
+    (decode-time specified-time)))
+
 (defun shimbun-sort-headers (headers)
   "Return a list of sorted HEADERS by date in increasing order."
   (sort headers
@@ -1051,35 +1353,65 @@
 	      (and (= (car a) (car b))
 		   (< (cadr a) (cadr b)))))))
 
-(if (fboundp 'regexp-opt)
-    (defalias 'shimbun-regexp-opt 'regexp-opt)
-  (defun shimbun-regexp-opt (strings &optional paren)
-    "Return a regexp to match a string in STRINGS.
-Each string should be unique in STRINGS and should not contain any regexps,
-quoted or not.  If optional PAREN is non-nil, ensure that the returned regexp
-is enclosed by at least one regexp grouping construct."
-    (let ((open-paren (if paren "\\(" "")) (close-paren (if paren "\\)" "")))
-      (concat open-paren (mapconcat 'regexp-quote strings "\\|") close-paren))))
-
-(defun shimbun-decode-entities-string (string)
-  "Decode entities in the STRING."
-  (with-temp-buffer
-    (insert string)
-    (shimbun-decode-entities)
-    (buffer-string)))
-
 (defun shimbun-remove-tags (begin-tag &optional end-tag)
-  "Remove all occurrences of regions surrounded by BEGIN-TAG and END-TAG."
+  "Remove all occurrences of regions surrounded by BEGIN-TAG and END-TAG.
+
+If END-TAG is neither nil nor a string, it works strictly for open and
+close tags (i.e. <tag>...</tag>).  In that case, BEGIN-TAG should be a
+regexp matching text within an open tag \"<...>\", and buffer's text that
+matches the first non-shy sub-expression surrounded by parens \"\\\\(...\\\\)\"
+in BEGIN-TAG is regarded as a name of an open tag; if there is no paren
+in BEGIN-TAG, the whole text that matches BEGIN-TAG is regarded as a tag
+name."
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (if end-tag
-	(let (pos)
-	  (while (and (re-search-forward begin-tag nil t)
-		      (setq pos (match-beginning 0))
-		      (re-search-forward end-tag nil t))
-	    (delete-region pos (point))))
-      (while (re-search-forward begin-tag nil t)
-	(delete-region (match-beginning 0) (match-end 0))))))
+    (cond ((stringp end-tag)
+	   (let (pos)
+	     (while (and (re-search-forward begin-tag nil t)
+			 (setq pos (match-beginning 0))
+			 (re-search-forward end-tag nil t))
+	       (delete-region pos (point)))))
+	  ((null end-tag)
+	   (while (re-search-forward begin-tag nil t)
+	     (delete-region (match-beginning 0) (match-end 0))))
+	  (t
+	   (setq begin-tag
+		 (if (string-match "\\\\([^?]" begin-tag)
+		     (concat "<[\t\n\r ]*" begin-tag)
+		   (concat "<[\t\n\r ]*\\(" begin-tag "\\)[\t\n\r >]")))
+	   (while (re-search-forward begin-tag nil t)
+	     (when (or (not (eq (match-end 0) (match-end 1)))
+		       (memq (char-after) '(?\t ?\n ?\r ?  ?>)))
+	       (goto-char (match-beginning 0))
+	       (if (shimbun-end-of-tag (match-string 1) t)
+		   (replace-match "\n")
+		 (goto-char (match-end 0)))))))))
+
+(defun shimbun-remove-orphaned-tag-strips (string)
+  "Remove orphaned tag strips that match STRING.
+STRING is like the inside of a \"\\\\(...\\\\)\" in a regular expression."
+  (let (regexp st nd)
+    (setq regexp (concat "<[\t\n\r ]*/[\t\n\r ]*\\(" string
+			 "\\)\\(?:[\t\n\r ][^>]+\\)?[\t\n\r ]*>[\t ]*"))
+    (goto-char (point-max))
+    (while (re-search-backward regexp nil t)
+      (setq st (match-beginning 0)
+	    nd (goto-char (match-end 0)))
+      (unless (prog1
+		  (shimbun-beginning-of-tag (match-string 1))
+		(goto-char st))
+	(skip-chars-backward "\t\n\r ")
+	(delete-region (point) nd)))
+    (setq regexp (concat "[\t\n\r ]*<[\t\n\r ]*\\(" string
+			 "\\)\\(?:[\t\n\r ][^>]+\\)?[\t\n\r ]*>[\t ]*"))
+    (goto-char (point-min))
+    (while (re-search-forward regexp nil t)
+      (setq st (goto-char (match-beginning 0))
+	    nd (match-end 0))
+      (unless (prog1
+		  (shimbun-end-of-tag (match-string 1))
+		(goto-char nd))
+	(delete-region st nd)))))
 
 (defun shimbun-remove-markup ()
   "Remove all HTML markup, leaving just plain text."
@@ -1093,35 +1425,12 @@
     (while (re-search-forward "<[^>]+>" nil t)
       (replace-match "" t t))))
 
-(defsubst shimbun-strip-cr ()
+(defun shimbun-strip-cr ()
   "Strip ^M from the end of all lines."
   (goto-char (point-max))
   (while (search-backward "\r\n" nil t)
     (delete-char 1)))
 
-(eval-and-compile
-  (cond
-   ((fboundp 'replace-in-string)
-    (defalias 'shimbun-replace-in-string 'replace-in-string))
-   ((fboundp 'replace-regexp-in-string)
-    (defun shimbun-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
-    (defun shimbun-replace-in-string (string regexp newtext &optional literal)
-      (let ((start 0) tail)
-	(while (string-match regexp string start)
-	  (setq tail (- (length string) (match-end 0)))
-	  (setq string (replace-match newtext nil literal string))
-	  (setq start (- (length string) tail))))
-      string))))
-
 (if (fboundp 'subst-char-in-string)
     (defalias 'shimbun-subst-char-in-string 'subst-char-in-string)
   (defun shimbun-subst-char-in-string (fromchar tochar string
@@ -1152,9 +1461,10 @@
 it will run silently.  The `shimbun-message-enable-logging' variable
 controls whether this function should preserve a message in the
 *Messages* buffer."
-  (let ((default-enable-multibyte-characters t)
-	specifier)
+  (let (specifier)
     (with-temp-buffer
+      (static-unless (featurep 'xemacs)
+	(set-buffer-multibyte t))
       (insert fmt)
       (goto-char (point-min))
       (while (search-forward "#" nil t)
@@ -1194,18 +1504,345 @@
       (goto-char (point-min))
       (let ((case-fold-search t)
 	    start)
-	(when (and (re-search-forward (shimbun-content-start-internal shimbun)
-				      nil t)
+	(when (and (re-search-forward (shimbun-content-start shimbun) nil t)
 		   (setq start (point))
-		   (re-search-forward (shimbun-content-end-internal shimbun)
-				      nil t))
+		   (re-search-forward (shimbun-content-end shimbun) nil t))
 	  (narrow-to-region start (match-beginning 0)))))
     (goto-char (point-min))
-    (while (re-search-forward "<p[^>]*>\\|</p>\\|[、。）」]+" nil t)
-      (unless (eolp)
-	(insert "\n"))))
+    (while (re-search-forward
+	    "<p[\t\n ]+[^>]*>\\|</p>\\|\\([、。）」]+\\)\\(\\cj\\)?"
+	    nil t)
+      (if (match-beginning 2)
+	  (replace-match "\\1\n\\2")
+	(unless (eolp)
+	  (insert "\n")))))
   (goto-char (point-min)))
 
+(defmacro shimbun-with-narrowed-article (shimbun &rest forms)
+  "Narrow to the article in the buffer and evaluate FORMS."
+  `(progn
+     (shimbun-strip-cr)
+     (goto-char (point-min))
+     (let ((case-fold-search t)
+	   start)
+       (when (re-search-forward (shimbun-content-start ,shimbun) nil t)
+	 (setq start (match-end 0))
+	 (when (re-search-forward (shimbun-content-end ,shimbun) nil t)
+	   (narrow-to-region start (match-beginning 0))
+	   (goto-char (point-min))
+	   ;; Remove trailing whitespace.
+	   (while (re-search-forward "[\t ]+$" nil t)
+	     (delete-region (match-beginning 0) (match-end 0)))
+	   (goto-char (point-min))
+	   ,@forms
+	   (widen))
+	 (goto-char (point-min))))))
+
+(static-if (featurep 'xemacs)
+    (defalias 'shimbun-char-category-list 'char-category-list)
+  (defun shimbun-char-category-list (char)
+    "Return a list of category mnemonics for CHAR."
+    (append (category-set-mnemonics (char-category-set char)) nil)))
+
+(eval-when-compile
+  (defsubst shimbun-japanese-hankaku-region-1 (start end quote)
+    (save-restriction
+      (narrow-to-region start end)
+      (goto-char start)
+      (when quote
+	(while (re-search-forward "＜\\(?:[ 　]\\|&nbsp;\\)?" nil t)
+	  (replace-match "&lt;"))
+	(goto-char start)
+	(while (re-search-forward "\\(?:[ 　]\\|&nbsp;\\)?＞" nil t)
+	  (replace-match "&gt;"))
+	(goto-char start)
+	(while (search-forward "＆" nil t)
+	  (replace-match "&amp;"))
+	(goto-char start))
+      (while (re-search-forward "\
+\\(?:[Ｆｆ][Ｉｉ][Ｌｌ][Ｅｅ]\\|[Ｆｆ][Ｔｔ][Ｐｐ]\
+\\|[Ｈｈ][Ｔｔ][Ｔｔ][Ｐｐ][Ｓｓ]?\\|[Ｍｍ][Ａａ][Ｉｉ][Ｌｌ][Ｔｔ][Ｏｏ]\\)\
+：\\cj+"
+				nil t)
+	(japanese-hankaku-region (match-beginning 0) (match-end 0) t))
+      (goto-char start)
+      (while (re-search-forward "\\([^0-9０-９]\\)：\\|：\\([^ 0-9　０-９]\\)"
+				nil t)
+	(if (match-beginning 1)
+	    (replace-match "\\1:")
+	  (replace-match ":\\2")
+	  (backward-char 1))
+	(unless (looking-at "&nbsp;")
+	  (insert " ")))
+      (goto-char start)
+      (while (search-forward "；" nil t)
+	(replace-match ";")
+	(unless (looking-at "[ 　]\\|&nbsp;")
+	  (insert " ")))
+      (goto-char start)
+      ;; Ｚ＠Ｚ -> Ｚ@Ｚ
+      ;; where Ｚ is a zenkaku alphanumeric, ＠ is a zenkaku symbol.
+      (while (re-search-forward "\\cA[．´｀＾＿―‐／＼｜’＠]\\cA" nil t)
+	(backward-char 2)
+	(insert (prog1
+		    (cdr (assq (char-after)
+			       '((?． . ?.) (?´ . ?') (?｀ . ?`)
+				 (?＾ . ?^) (?＿ . ?_) (?― . ?-)
+				 (?‐ . ?-) (?／ . ?/) (?＼ . ?\\)
+				 (?｜ . ?|) (?’ . ?') (?＠ . ?@))))
+		  (delete-char 1))))
+      (goto-char start)
+      ;; Replace Chinese hyphen with "−".
+      (condition-case nil
+	  (let ((regexp (concat "[" (list (make-char 'chinese-gb2312 35 45)
+					  (make-char 'chinese-big5-1 34 49))
+				"]")))
+	    (while (re-search-forward regexp nil t)
+	      (replace-match "−")))
+	(error))
+      (goto-char start)
+      (while (re-search-forward
+	      "[^　、。，．＿ー―‐〜〜‘’“”（）［］｛｝〈〉＝′″￥]+"
+	      nil t)
+	(japanese-hankaku-region (match-beginning 0) (match-end 0) t))
+      (goto-char start)
+      ;; Exclude ">　" in order not to break paragraph start.
+      (while (re-search-forward "\\([!-=?-~]\\)　\\|　\\([!-~]\\)" nil t)
+	(if (match-beginning 1)
+	    (replace-match "\\1 ")
+	  (unless (memq (char-before (match-beginning 0)) '(nil ?\n ?>))
+	    (replace-match " \\2"))
+	  (backward-char 1)))
+      (goto-char start)
+      (while (re-search-forward "\\([!-~]\\)、[ 　]*\\([!-~]\\)" nil t)
+	(replace-match "\\1, \\2")
+	(backward-char 1))
+      (goto-char start)
+      (while (re-search-forward "，\\(\\cj\\)" nil t)
+	(replace-match "、\\1")
+	(backward-char 1))
+      (goto-char start)
+      (while (re-search-forward "\\(\\cj\\)，" nil t)
+	(replace-match "\\1、"))
+      (goto-char start)
+      (while (re-search-forward "\\([0-9]\\)，\\([0-9][0-9][0-9][^0-9]\\)"
+				nil t)
+	(replace-match "\\1,\\2")
+	(backward-char 2))
+      (goto-char start)
+      (while (re-search-forward "\
+\\([0-9]\\)\\(?:\\(．\\)\\|\\(＿\\)\\|\\(―\\)\\|\\(‐\\)\\)\\([0-9]\\)"
+				nil t)
+	(replace-match (cond ((match-beginning 2)
+			      "\\1.\\6")
+			     ((match-beginning 3)
+			      "\\1_\\6")
+			     ((or (match-beginning 4) (match-beginning 5))
+			      "\\1-\\6")))
+	(backward-char 1))
+      (when (eq w3m-output-coding-system 'utf-8)
+	(goto-char start)
+	(while (re-search-forward "\\([�!.!0‘“]\\)\\|[�!c’”°′″]" nil t)
+	  (if (match-beginning 1)
+	      (or (memq (char-before (match-beginning 1)) '(?  ?　))
+		  (string-equal (buffer-substring
+				 (match-beginning 1)
+				 (max (- (match-beginning 1) 6)
+				      start))
+				"&nbsp;")
+		  (progn
+		    (backward-char 1)
+		    (insert " ")
+		    (forward-char 1)))
+	    (unless (looking-at "?:[ 　]\\|&nbsp;")
+	      (insert " ")))))
+
+      ;; Do wakachi-gaki.
+      ;; FIXME:“花の中 3トリオ”“ベスト 8進出”
+      (goto-char start)
+      (while (re-search-forward
+	      "\\(\\cj\\)\\(?:[ 　]\\|&nbsp;\\)\\([])>}]\
+\\|&#\\(?:62\\|187\\|8217\\|8221\\|8250\\|8969\\|8971\\|9002\\);\
+\\|&\\(?:gt\\|raquo\\|rsquo\\|rdquo\\|rsaquo\\|rceil\\|rfloor\\|rang\\);\\)\
+\\|\\([(<[{]\\|&#\\(?:60\\|171\\|8216\\|8220\\|8249\\|8968\\|8970\\|9001\\);\
+\\|&\\(?:lt\\|laquo\\|lsquo\\|ldquo\\|lsaquo\\|lceil\\|lfloor\\|lang\\);\\)\
+\\(?:[ 　]\\|&nbsp;\\)\\(\\cj\\)"
+	      nil t)
+	(replace-match (if (match-beginning 1) "\\1\\2" "\\3\\4"))
+	(backward-char 1))
+      (goto-char start)
+      (while (re-search-forward "\
+\\(\\(?:[^0-9]\\|\\`\\)\\cj\\)\\([0-9]+\\(?:[,.][0-9]+\\)*[^0-9]\\)\
+\\|\\(\\(?:[^0-9]\\|\\`[0-9]*\\)[!-/:-=?-~][0-9]+\\(?:[,.][0-9]+\\)*\\)\
+\\(\\cj\\)\
+\\|\\([0-9]\\)\\(\\cH[^0-9]\\)\
+\\|\\(\\cj\\)\\([(<A-Z[a-z{]\
+\\|&#\\(?:60\\|171\\|8216\\|8220\\|8249\\|8968\\|8970\\|9001\\);\
+\\|&\\(?:lt\\|laquo\\|lsquo\\|ldquo\\|lsaquo\\|lceil\\|lfloor\\|lang\\);\\)\
+\\|\\([]%)>A-Za-z}]\
+\\|&#\\(?:62\\|187\\|8217\\|8221\\|8250\\|8969\\|8971\\|9002\\);\
+\\|&\\(?:gt\\|raquo\\|rsquo\\|rdquo\\|rsaquo\\|rceil\\|rfloor\\|rang\\);\\)\
+\\(\\cj\\)"
+				nil t)
+	(cond
+	 ((match-beginning 1)
+	  (unless (or
+		   (and (member (match-string 1)
+				'("明治" "大正" "昭和" "平成"))
+			(eq (char-before) ?年))
+		   (and (member (match-string 1) '("午前" "午後"))
+			(eq (char-before) ?時))
+		   (memq (char-before (match-end 1))
+			 '(?　 ?＋ ?− ?± ?× ?÷ ?＝ ?≠ ?≦ ?≧ ?�
+			       ?≪ ?≫))
+		   (and (memq (char-before (match-end 1)) '(?第 ?約))
+			(memq ?j
+			      (shimbun-char-category-list (char-before)))))
+	    (replace-match "\\1 \\2"))
+	  (goto-char (match-end 1)))
+	 ((match-beginning 3)
+	  (replace-match "\\3 \\4")
+	  (goto-char (match-end 3)))
+	 ((match-beginning 5)
+	  (unless (memq (char-after (match-beginning 6)) '(?つ))
+	    (replace-match "\\5 \\6"))
+	  (goto-char (match-end 5)))
+	 ((match-beginning 7)
+	  (unless (eq (char-after (match-beginning 7)) ?　)
+	    (replace-match "\\7 \\8"))
+	  (goto-char (match-end 7)))
+	 (t
+	  (unless (string-equal (buffer-substring
+				 (max (- (match-beginning 10) 3)
+				      (point-min))
+				 (match-beginning 10))
+				"<p>")
+	    (replace-match (concat "\\9 " (match-string 10))))
+	  (goto-char (match-end 9)))))
+      (goto-char start)
+      (let ((regexp
+	     (if (eq w3m-output-coding-system 'utf-8)
+		 "\\(\\cG\\|\\cg\\)\\(\\cj\\)\\|\\(\\cj\\)\\(\\cG\\|\\cg\\)"
+	       "\\(\\cg\\)\\(\\cj\\)\\|\\(\\cj\\)\\(\\cg\\)")))
+	(while (re-search-forward regexp nil t)
+	  (if (match-beginning 1)
+	      (unless (eq (char-before) ?　)
+		(replace-match "\\1 \\2"))
+	    (unless (eq (char-after (match-beginning 3)) ?　)
+	      (replace-match "\\3 \\4")))
+	  (backward-char 1)))
+
+      ;; Finally strip useless space.
+      (goto-char start)
+      (while (re-search-forward "\\(※\\) \\([0-9]\\)" nil t)
+	(replace-match "\\1\\2"))
+      (goto-char start)
+      (let ((regexp
+	     (if (eq w3m-output-coding-system 'utf-8)
+		 (eval-when-compile
+		   (let ((chars "�!2!4!6!8!:!<!>���、。，．・゛゜￣ヽヾゝゞ〃\
+〜（）〔〕［］｛｝〈〉《》「」『』【】"))
+		     (concat "\\(?:[ 　]\\|&nbsp;\\)\\([" chars "�!f々℃]\\)"
+			     "\\|\\([" chars "]\\)\\(?:[ 　]\\|&nbsp;\\)")))
+	       (eval-when-compile
+		 (let ((chars "�!.!0!2!4!6!8!:!<!>!c!d!e!l���、。，．・゛゜¨\
+￣ヽヾゝゞ〃〜‖…‥‘’“”（）〔〕［］｛｝〈〉《》「」『』【】°′″§"))
+		   (concat "\\(?:[ 　]\\|&nbsp;\\)\\([" chars "�!f々℃]\\)"
+			   "\\|\\([" chars "]\\)\\(?:[ 　]\\|&nbsp;\\)"))))))
+	(while (re-search-forward regexp nil t)
+	  (goto-char (match-beginning 0))
+	  (if (match-beginning 1)
+	      (if (or (bobp)
+		      (eq (save-match-data
+			    (when (re-search-backward ">[\t\n ]*" nil t)
+			      (match-end 0)))
+			  (match-beginning 0)))
+		  ;; Don't break paragraph start.
+		  (goto-char (match-beginning 1))
+		(delete-region (goto-char (match-beginning 0))
+			       (match-beginning 1)))
+	    (delete-region (match-end 2) (match-end 0)))))
+      (goto-char (point-max)))))
+
+(defun shimbun-japanese-hankaku-region (start end &optional quote)
+  "Convert Japanese zenkaku ASCII chars between START and END into hankaku.
+There are exceptions; some chars and the ones in links aren't converted,
+and \"＜\", \"＞\" and \"＆\" are quoted if QUOTE is non-nil."
+  (setq end (set-marker (make-marker) end))
+  (while start
+    (goto-char start)
+    (set-match-data nil)
+    (re-search-forward "<a[\t\n\r ]+\\(?:[^\t\n\r ]+[\t\n\r ]+\\)*\
+\\(?:href=\"\\([^\"]+\\)\\|href=\'\\([^']+\\)\\)\
+\\|<img[\t\n\r ]+\\(?:[^\t\n\r ]+[\t\n\r ]+\\)*\
+\\(?:src=\"\\([^\"]+\\)\\|src=\'\\([^']+\\)\\)"
+		       end t)
+    (shimbun-japanese-hankaku-region-1
+     (prog1
+	 start
+       (setq start (cadr (match-data)))) ;; marker of (match-end 0)
+     (or (match-beginning 1) (match-beginning 2) (match-beginning 3)
+	 (match-beginning 4) end)
+     quote))
+  (set-marker end nil))
+
+(defun shimbun-japanese-hankaku-buffer (&optional quote)
+  "Convert Japanese zenkaku ASCII chars in the current buffer into hankaku.
+Sections surrounded by the <pre>...</pre> tags are not processed.
+There are exceptions; some chars aren't converted, and \"＜\", \"＞\" and
+\"＆\" are quoted if QUOTE is non-nil."
+  (let ((start (goto-char (point-min))))
+    (while (search-forward "<pre>" nil t)
+      (when (> (match-beginning 0) start)
+	(shimbun-japanese-hankaku-region start (match-beginning 0) quote)
+	(forward-char 5))
+      (search-forward "</pre>" nil 'move)
+      (setq start (point)))
+    (unless (eobp)
+      (shimbun-japanese-hankaku-region start (point-max) quote))))
+
+;; Silence XEmacs's byte compiler.
+(eval-when-compile
+  (if (fboundp 'libxml-parse-xml-region) nil
+    (defalias 'libxml-parse-xml-region 'ignore)))
+
+(defun shimbun-xml-parse-buffer ()
+  "Calls (lib)xml-parse-region on the whole buffer.
+This is a wrapper for `xml-parse-region', which will resort to
+using `libxml-parse-xml-region' if available, since it is much
+faster."
+  (if (and (fboundp 'libxml-parse-xml-region)
+	   (not (eq (symbol-function 'libxml-parse-xml-region) 'ignore)))
+      (save-excursion
+	(goto-char (point-min))
+	(let ((xml (when (search-forward "<" nil t)
+		     (libxml-parse-xml-region (match-beginning 0) (point-max))))
+	      start stylestring stylesheet)
+	  (if xml
+	      (progn
+		;; Parse the stylesheet
+		(goto-char (point-min))
+		(when (re-search-forward "<\\(rss\\|feed\\)\\(.*?\\)>"
+					 nil t)
+		  (setq stylestring (match-string 2)
+			start 0)
+		  (while (string-match "\\(xmlns:?.*?\\)=\"\\(.*?\\)\""
+				       stylestring start)
+		    (setq start (match-end 0))
+		    (push (cons (intern (match-string 1 stylestring))
+				(match-string 2 stylestring))
+			  stylesheet)))
+		;; Add stylesheet into XML structure
+		(when stylesheet
+		  (if (nth 1 xml)
+		      (nconc (nth 1 xml) stylesheet)
+		    (setcar (cdr xml) stylesheet)))
+		(list xml))
+	    ;; Unfortunately libxml failed parsing for some reason.
+	    (xml-parse-region (point-min) (point-max)))))
+    ;; We don't have libxml, so just use the slow one.
+    (xml-parse-region (point-min) (point-max))))
+
 (provide 'shimbun)
 
 ;;; shimbun.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-antenna.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-antenna.el
--- work/emacs-w3m-1.4.4/w3m-antenna.el	2005-03-22 17:01:12.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-antenna.el	2009-11-06 17:51:39.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-antenna.el --- Utility to detect changes of WEB
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -108,19 +108,19 @@
 ")
 
 (defmacro w3m-antenna-site-key (site)
-  (` (car (, site))))
+  `(car ,site))
 (defmacro w3m-antenna-site-title (site)
-  (` (nth 1 (, site))))
+  `(nth 1 ,site))
 (defmacro w3m-antenna-site-class (site)
-  (` (nth 2 (, site))))
+  `(nth 2 ,site))
 (defmacro w3m-antenna-site-url (site)
-  (` (nth 3 (, site))))
+  `(nth 3 ,site))
 (defmacro w3m-antenna-site-last-modified (site)
-  (` (nth 4 (, site))))
+  `(nth 4 ,site))
 (defmacro w3m-antenna-site-size (site)
-  (` (nth 5 (, site))))
+  `(nth 5 ,site))
 (defmacro w3m-antenna-site-size-detected (site)
-  (` (nth 6 (, site))))
+  `(nth 6 ,site))
 
 (defcustom w3m-antenna-file
   (expand-file-name ".antenna" w3m-profile-directory)
@@ -128,6 +128,15 @@
   :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)
@@ -173,7 +182,7 @@
 (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</head>\n<body>\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"
@@ -220,8 +229,13 @@
 (defun w3m-antenna-alist ()
   (let ((alist (w3m-load-list w3m-antenna-file)))
     (mapcar (lambda (site)
-	      (or (assoc (w3m-antenna-site-key site) alist)
-		  (append site (list nil nil nil nil))))
+	      (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)
@@ -271,7 +285,7 @@
 		(site site))
     (w3m-process-do-with-temp-buffer
 	(type (w3m-retrieve url nil t nil nil handler))
-      (let (link date dc-dates)
+      (let (link date dates)
 	(when type
 	  (w3m-decode-buffer url)
 	  (let* ((xml (ignore-errors
@@ -282,19 +296,40 @@
 			  xml "http://purl.org/rss/1.0/"))
 		 (channel (car (w3m-rss-find-el
 				(intern (concat rss-ns "channel"))
-				xml))))
+				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 dc-dates (w3m-rss-find-el
-			    (intern (concat dc-ns "date"))
-			    channel))
-	    (when dc-dates
-	      (setq date '(0 0))
-	      (dolist (tmp dc-dates)
-		(setq tmp (w3m-rss-parse-date-string (nth 2 tmp)))
-		(when (w3m-time-newer-p tmp date)
-		  (setq date tmp))))))
+	    (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))))))
@@ -413,11 +448,10 @@
 	    (incf index)
 	    (funcall function
 		     element
-		     (let ((var (make-symbol "tmpvar")))
-		       (cons `(lambda (x)
-				(aset ,table ,index x)
-				(w3m-antenna-mapcar-after ,table ,buffer))
-			     handler)))))
+		     (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)
@@ -514,7 +548,16 @@
 	(insert (let ((time (nth 5 (file-attributes w3m-antenna-file))))
 		  (if time
 		      (current-time-string time)
-		    "(unknown)"))))))))
+		    "(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
Only in work/emacs-w3m-1.4.4/: w3m-bitmap.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-bookmark.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-bookmark.el
--- work/emacs-w3m-1.4.4/w3m-bookmark.el	2003-11-28 14:56:25.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-bookmark.el	2012-10-11 07:51:20.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-bookmark.el --- Functions to operate bookmark file of w3m
 
-;; Copyright (C) 2001, 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001-2003, 2005-2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
 ;;          TSUCHIYA Masatoshi <tsuchiya@namazu.org>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -37,6 +37,7 @@
 (eval-when-compile (require 'cl))
 (require 'w3m-util)
 (require 'w3m)
+(require 'easymenu)
 
 (defcustom w3m-bookmark-file
   (expand-file-name "bookmark.html" w3m-profile-directory)
@@ -66,6 +67,11 @@
   :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"))
@@ -136,14 +142,10 @@
 (add-hook 'w3m-display-functions 'w3m-bookmark-mode-setter)
 
 (defun w3m-bookmark-file-modtime ()
-  "Return the bookmark file modification time.
-The value is a list of the form (HIGH . LOW), like the time values
-that `visited-file-modtime' returns.  When the bookmark file does not
-exist, returns (0 . 0)."
-  (if (file-exists-p w3m-bookmark-file)
-      (let ((time (nth 5 (file-attributes w3m-bookmark-file))))
-	(cons (car time) (cadr time)))
-    (cons 0 0)))
+  "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."
@@ -157,12 +159,12 @@
       (with-current-buffer (w3m-get-buffer-create " *w3m bookmark*")
 	(unless (and w3m-bookmark-buffer-file-name
 		     (or no-verify-modtime
-			 (equal (visited-file-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)
-		  (file-coding-system-for-read 'binary))
+	    (let ((coding-system-for-read 'binary))
 	      (insert-file-contents w3m-bookmark-file))
 	    (w3m-decode-buffer
 	     (w3m-expand-file-name-as-url w3m-bookmark-file))
@@ -173,12 +175,14 @@
 	       w3m-current-coding-system))
 	    (set-buffer-modified-p nil))
 	  (setq w3m-bookmark-buffer-file-name w3m-bookmark-file)
-	  (set-visited-file-modtime (w3m-bookmark-file-modtime))
+	  (set-visited-file-modtime (or (w3m-bookmark-file-modtime)
+					;; No bookmark file.
+					'(0 0)))
 	  (buffer-enable-undo))
 	(current-buffer)))))
 
 (defun w3m-bookmark-verify-modtime ()
-  (unless (equal (visited-file-modtime)
+  (unless (equal (w3m-visited-file-modtime)
 		 (w3m-bookmark-file-modtime))
     (if (buffer-file-name)
 	(ask-user-about-supersession-threat w3m-bookmark-file)
@@ -195,15 +199,14 @@
 (defun w3m-bookmark-sections ()
   "Return collection of registered sections."
   (let (sections)
-    (save-excursion
-      (set-buffer (w3m-bookmark-buffer))
+    (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)
-		       (line-end-position)))
+		       (point-at-eol)))
 		    nil)
 	      sections)))
     (nreverse sections)))
@@ -232,11 +235,10 @@
 	  (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-cond
-		((boundp 'MULE) file-coding-system)
-		((featurep 'mule) buffer-file-coding-system))))
+  (w3m-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
@@ -250,8 +252,7 @@
 
 (defun w3m-bookmark-write-file (url title section)
   "Make new bookmark with specified spec, and save it."
-  (save-excursion
-    (set-buffer (w3m-bookmark-buffer))
+  (with-current-buffer (w3m-bookmark-buffer)
     (setq title (w3m-bookmark-safe-string
 		 title
 		 "Specified title includes unsafe character(s): %s")
@@ -309,21 +310,39 @@
       (message "No anchor")		; nothing to do
     (let ((url (w3m-anchor))
 	  (title (buffer-substring-no-properties
-		  (previous-single-property-change (1+ (point)) 'w3m-href-anchor)
+		  (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 link of current page to bookmark.
-With prefix, ask new url to add instead of current page."
+  "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)
@@ -339,28 +358,44 @@
 
 ;;;###autoload
 (defun w3m-bookmark-view (&optional reload)
+  "Display the bookmark."
   (interactive "P")
-  (w3m-goto-url "about://bookmark/" reload))
+  (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 (w3m-bookmark-buffer))
+  (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)
+    (while (re-search-forward "\n<\\(?:h2\\|\\(li\\)\\)>" nil t)
       (forward-char -1)
-      (insert (if (match-beginning 2)
+      (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 (line-end-position) 'w3m-name-anchor))))
+  (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)))))
@@ -380,20 +415,19 @@
       (w3m-bookmark-view t))))
 
 (defun w3m-bookmark-kill-entries (entries)
-  (save-excursion
-    (set-buffer (w3m-bookmark-buffer t))
+  (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 (line-beginning-position))
+	  (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)
-			       (line-beginning-position)
+			       (point-at-bol)
 			     end))
 	    (goto-char (1- beg))))))
     (w3m-bookmark-save-buffer)))
@@ -402,8 +436,7 @@
   "Undo some previous changes on bookmark."
   (interactive "p")
   (condition-case nil
-      (save-excursion
-	(set-buffer (w3m-bookmark-buffer t))
+      (with-current-buffer (w3m-bookmark-buffer t)
 	(w3m-bookmark-verify-modtime)
 	(undo arg)
 	(w3m-bookmark-save-buffer))
@@ -415,6 +448,141 @@
   (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)))) ;; 閲
+    `(([,(w3m-make-menu-item (concat "ブックマークの" etsu "覧") "View Bookmark")
+	w3m-bookmark-view t]
+       [,(w3m-make-menu-item (concat "新セッションでブックマークの" etsu "覧")
+			     "View Bookmark in a New Session")
+	w3m-bookmark-view-new-session t]
+       [,(w3m-make-menu-item "ブックマークの編集" "Edit Bookmark")
+	w3m-bookmark-edit t]
+       "----"
+       [,(w3m-make-menu-item "このページをブックマーク" "Add Current URL to Bookmark")
+	w3m-bookmark-add-current-url t]
+       [,(w3m-make-menu-item "すべての URL をブックマーク" "Add These URLs to Bookmark")
+	w3m-bookmark-add-current-url-group t]
+       [,(w3m-make-menu-item "この URL をブックマーク" "Add This URL to Bookmark")
+	w3m-bookmark-add-this-url (w3m-anchor)])
+      .
+      ([,(w3m-make-menu-item "このエントリを消去" "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 "もとに戻す" "Undo")
+	w3m-bookmark-undo t]
+       [,(w3m-make-menu-item "ブックマークの編集" "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)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-bug.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-bug.el
--- work/emacs-w3m-1.4.4/w3m-bug.el	2004-06-12 20:21:11.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-bug.el	2010-01-13 09:59:40.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-bug.el --- command to report emacs-w3m bugs -*- coding: euc-japan -*-
 
-;; Copyright (C) 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2002, 2003, 2005, 2007, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -49,6 +50,7 @@
 		   (functionp 'Meadow-version))
 	       '(Meadow-version)))
       system-type
+      (featurep 'gtk)
       w3m-version
       w3m-type
       w3m-compile-options
@@ -70,13 +72,6 @@
 (eval-when-compile
   (require 'cl))
 
-(eval-and-compile
-  (cond ((boundp 'MULE)
-	 (require 'w3m-om))
-	((and (not (featurep 'xemacs))
-	      (= emacs-major-version 19))
-	 (require 'w3m-e19))))
-
 (defun report-emacs-w3m-bug (topic &optional buffer)
   "Report a bug in emacs-w3m.
 Prompts for bug subject.  Leaves you in a mail buffer."
@@ -85,7 +80,7 @@
 	  (buffers (cons buffer (delq buffer (buffer-list))))
 	  (inhibit-point-motion-hooks t)
 	  keymap)
-     (save-excursion
+     (save-current-buffer
        (while buffers
 	 (setq buffer (car buffers)
 	       buffers (cdr buffers))
@@ -107,7 +102,7 @@
   (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)
+  (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)
@@ -115,7 +110,7 @@
     (insert
      (if (and (boundp 'w3m-language)
 	      (equal (symbol-value 'w3m-language) "Japanese"))
-	 "������������ emacs-w3m ��������������������������������\n"
+	 "������������ emacs-w3m ����������������������������������\n"
        "It is if possible, please redo after starting emacs-w3m.\n")
      "\
 ================================================================\n"))
@@ -131,12 +126,12 @@
 ������������������������������������������������!!")
 			       (point))
 			     'face 'underline)
-	  (insert "\n\n����������������������������:
+	  (insert "\n\n������������������������������:
 \t- ����������������?
 \t- ������������������������������������?
 \t- ����������������������? (������)
 
-���� Lisp ����������������������������������������\n"))
+���� Lisp ������������������������������������������\n"))
       (insert "\
 This bug report will be sent to the emacs-w3m development team,\n")
       (put-text-property (point)
@@ -163,6 +158,7 @@
   (insert "Dear Bug Team!\n\n")
   (let ((user-point (point))
 	(print-escape-newlines t)
+	(print-quoted t)
 	infos print-length print-level)
     (insert "\n
 ================================================================
Only in work/emacs-w3m-1.4.4/: w3m-bug.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-ccl.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-ccl.el
--- work/emacs-w3m-1.4.4/w3m-ccl.el	2005-03-18 16:51:13.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-ccl.el	2011-07-13 16:04:39.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; w3m-ccl.el --- CCL programs to process Unicode and internal characters.
 
-;; Copyright (C) 2001, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001, 2003-2007, 2011 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
@@ -20,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -42,19 +41,21 @@
   (cond
    ((featurep 'xemacs)
     (require 'pccl))
-   ((boundp 'MULE)
-    (let ((features (cons 'w3m-ccl features)))
-      (require 'w3m-om)) ;; for `charset-id'
-    (require 'pccl))
    (t
     (require 'ccl))))
 
 ;;; CCL programs:
 
 (eval-when-compile
-  (when (and (not (fboundp 'charset-id))
-	     (fboundp 'charset-id-internal))
-    (defalias 'charset-id 'charset-id-internal)))
+  (if (fboundp 'charset-id)
+      (if (or (get 'charset-id 'byte-obsolete-info)
+	      (eq (get 'charset-id 'byte-compile) 'byte-compile-obsolete))
+	  (defmacro w3m-charset-id (charset) 0)
+	(defmacro w3m-charset-id (charset) `(charset-id ,charset)))
+    (if (fboundp 'charset-id-internal)
+	(defmacro w3m-charset-id (charset)
+	  `(charset-id-internal ,charset))
+      (defmacro w3m-charset-id (charset) 0))))
 
 (eval-and-compile
   (defconst w3m-internal-characters-alist
@@ -70,35 +71,35 @@
       (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)))))))
+	  `((,r1 &= ?\x7f)
+	    ,@(unless unibyte
+		`((,r1 |= ((,r0 & ?\x7f) << 7))))
+	    (,r0 = ,(w3m-charset-id charset))
+	    (write-multibyte-character ,r0 ,r1)
+	    (repeat))
+	`((write ,(w3m-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))
+	(if (r1 == ,(w3m-charset-id 'ascii))
 	    ;; (1) ASCII characters
 	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-jisx0201))
+	(if (r1 == ,(w3m-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)
+	(r2 = (r1 == ,(w3m-charset-id 'japanese-jisx0208-1978)))
+	(if ((r1 == ,(w3m-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))
+	(if (r1 == ,(w3m-charset-id 'katakana-jisx0201))
 	    ;; (4) Katakana Part of Japanese JISX0201.1976
 	    ((r0 |= 128)
 	     (write ?\x8e)
@@ -108,14 +109,14 @@
   (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))
+	(if (r1 == ,(w3m-charset-id 'ascii))
 	    ;; (1) ASCII characters
 	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-jisx0201))
+	(if (r1 == ,(w3m-charset-id 'latin-jisx0201))
 	    ;; (2) Latin Part of Japanese JISX0201.1976
 	    ;;     Convert to ASCII
 	    (write-repeat r0))
-	(if (r1 == ,(charset-id 'latin-iso8859-1))
+	(if (r1 == ,(w3m-charset-id 'latin-iso8859-1))
 	    ;; (3) Latin-1 characters
 	    ((r0 |= ?\x80)
 	     (write-repeat r0)))))
@@ -150,53 +151,53 @@
 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)))))
+  `(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))))))
+    `(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)))))
+  `(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))))))
+    `(1 (loop (read r0) (write-repeat r0)))))
 
 
 (provide 'w3m-ccl)
Only in work/emacs-w3m-1.4.4/: w3m-ccl.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-cookie.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-cookie.el
--- work/emacs-w3m-1.4.4/w3m-cookie.el	2003-12-05 16:52:34.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-cookie.el	2010-05-24 10:09:27.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-cookie.el --- Functions for cookie processing
 
-;; Copyright (C) 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2002, 2003, 2005, 2006, 2008, 2009, 2010
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Teranishi Yuuichi  <teranisi@gohome.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -48,7 +49,7 @@
 Currently only browser local cookies are stored.")
 
 (defconst w3m-cookie-two-dot-domains-regexp
-  (concat "\\.\\("
+  (concat "\\.\\(?:"
 	  (mapconcat 'identity (list "com" "edu" "net" "org" "gov" "mil" "int")
 		     "\\|")
 	  "\\)$")
@@ -75,6 +76,11 @@
 	  (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."
@@ -101,7 +107,7 @@
 (defmacro w3m-cookie-ignore (cookie)
   `(aref ,cookie 8))
 
-(defsubst w3m-cookie-create (&rest args)
+(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))
@@ -154,9 +160,12 @@
 				  (w3m-cookie-expires c))))
 	  (push c expires)
 	(when (and (not (w3m-cookie-ignore c))
-		   (string-match (concat
-				  (regexp-quote (w3m-cookie-domain c)) "$")
-				 host)
+		   (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))
@@ -173,11 +182,10 @@
 (defun w3m-parse-http-url (url)
   "Parse an absolute HTTP URL."
   (let (secure split)
-    (when (and (string-match w3m-url-components-regexp url)
-	       (or (string= (match-string 2 url) "http")
-		   (setq secure (string= (match-string 2 url) "https")))
-	       (match-beginning 4)
-	       (match-end 4))
+    (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
@@ -214,52 +222,46 @@
 (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 st nd)
-    (save-excursion
-      (save-restriction
-	(set-buffer (get-buffer-create " *w3m-cookie-parse-temp*"))
-	(set-syntax-table w3m-cookie-parse-args-syntax-table)
-	(erase-buffer)
-	(insert str)
-	(setq st (point-min)
-	      nd (point-max))
-	(set-syntax-table w3m-cookie-parse-args-syntax-table)
-	(narrow-to-region st nd)
-	(goto-char (point-min))
-	(while (not (eobp))
-	  (skip-chars-forward "; \n\t")
-	  (setq name-pos (point))
-	  (skip-chars-forward "^ \n\t=;")
-	  (if (not 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)))))))
-	  (setq results (cons (cons name value) results))
-	  (skip-chars-forward "; \n\t"))
-	results))))
+  (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."
@@ -289,7 +291,7 @@
        ((eq (string-to-char (car reject)) ?.)
 	(setq regexp (concat (regexp-quote (car reject)) "$")))
        (t (setq regexp (concat "^" (regexp-quote (car reject)) "$"))))
-      (when (string-match (concat regexp "$") host)
+      (when (string-match regexp host)
 	(setq rlen (length (car reject))
 	      reject nil))
       (pop reject))
@@ -315,6 +317,9 @@
     (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.
@@ -407,17 +412,29 @@
   "Clear cookie list."
   (setq w3m-cookies nil))
 
-(defun w3m-cookie-save ()
-  "Save cookies."
+(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 (w3m-cookie-expires cookie)
+      (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)
@@ -433,9 +450,10 @@
 
 ;;;###autoload
 (defun w3m-cookie-shutdown ()
-  "Save cookies."
+  "Save cookies, and reset cookies' data."
   (interactive)
-  (w3m-cookie-save)
+  (when w3m-cookie-save-cookies
+    (w3m-cookie-save))
   (setq w3m-cookie-init nil)
   (w3m-cookie-clear)
   (if (get-buffer " *w3m-cookie-parse-temp*")
@@ -453,10 +471,10 @@
 	    data)
 	(goto-char beg)
 	(while (re-search-forward
-		"^\\(Set-Cookie\\(2\\)?:\\) *\\(.*\\(\n[ \t].*\\)*\\)\n"
+		"^\\(?:Set-Cookie\\(2\\)?:\\) *\\(.*\\(?:\n[ \t].*\\)*\\)\n"
 		end t)
-	  (setq data (match-string 3))
-	  (if (match-beginning 2)
+	  (setq data (match-string 2))
+	  (if (match-beginning 1)
 	      (setq version 1))
 	  (apply
 	   (case version
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-dtree.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-dtree.el
--- work/emacs-w3m-1.4.4/w3m-dtree.el	2003-11-25 16:03:43.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-dtree.el	2009-05-21 08:13:29.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-dtree.el --- The add-on program to display local directory tree.
 
-;; Copyright (C) 2001, 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; 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>
@@ -17,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -61,33 +62,29 @@
   :group 'w3m
   :type '(radio
 	  (const :format "ASCII: " ["|-" "+-" "|  " "   "])
-	  (list
-	   :convert-widget
-	   (lambda (widget)
-	     (require 'w3m)
-	     (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")))
-			       ["|-" "+-" "|  " "   "])))
-	       `(vector
-		 :format "Others:\n%v" :indent 4
-		 :args
-		 ((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)))))))))
+	  (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
@@ -96,28 +93,24 @@
   :type '(radio
 	  (const :format "ASCII: " ["|=" "+="])
 	  (const :format "ASCII Bold: " ["<b>|-</b>" "<b>+-</b>"])
-	  (list
-	   :convert-widget
-	   (lambda (widget)
-	     (require 'w3m)
-	     (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")))
-			       ["|=" "+="])))
-	       `(vector
-		 :format "Others:\n%v" :indent 4
-		 :args
-		 ((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)))))))))
+	  (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)))))))
 
-(defsubst w3m-dtree-expand-file-name (path)
+(defun w3m-dtree-expand-file-name (path)
   (if (string-match "^\\(.\\):\\(.*\\)" path)
       (if w3m-use-cygdrive
 	  (concat "/cygdrive/"
@@ -125,20 +118,22 @@
 	(concat "/" (match-string 1 path) "|" (match-string 2 path)))
     path))
 
-(defsubst w3m-dtree-directory-name (path)
+(defun w3m-dtree-directory-name (path)
   (when (and w3m-treat-drive-letter
-	     (string-match "^/\\(\\([A-Za-z]\\)[|:]?\\|cygdrive/\\([A-Za-z]\\)\\)/" path))
+	     (string-match
+	      "^/\\(?:\\([A-Za-z]\\)[|:]?\\|cygdrive/\\([A-Za-z]\\)\\)/"
+	      path))
     (setq path (concat
-		(or (match-string 2 path)
-		    (match-string 3 path))
+		(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)))))
+  `(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))
@@ -212,10 +207,10 @@
 	(dirprefix "about://dtree")
 	(fileprefix "file://")
 	path)
-    (if (string-match "\\?allfiles=\\(\\(true\\)\\|false\\)$" url)
+    (if (string-match "\\?allfiles=\\(?:\\(true\\)\\|false\\)$" url)
 	(progn
 	  (setq path (substring url prelen (match-beginning 0)))
-	  (if (match-beginning 2) (setq allfiles t)))
+	  (if (match-beginning 1) (setq allfiles t)))
       (if w3m-dtree-default-allfiles
 	  (setq allfiles (not allfiles)))
       (setq path (substring url prelen)))
Only in work/emacs-w3m-1.4.4/: w3m-e19.el
Only in work/emacs-w3m-1.4.4/: w3m-e20.el
Only in work/emacs-w3m-1.4.4/: w3m-e21.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: w3m-ems.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-favicon.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-favicon.el
--- work/emacs-w3m-1.4.4/w3m-favicon.el	2005-03-18 06:50:01.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-favicon.el	2011-12-05 23:48:01.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-favicon.el --- utilities for handling favicon in emacs-w3m
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2005, 2007, 2009, 2011
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
@@ -21,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -54,20 +54,10 @@
   (autoload 'w3m-url-readable-string "w3m"))
 
 (defcustom w3m-favicon-size nil
-  "*Size of favicon. This value is used as geometry argument for `convert'."
+  "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
-  :get (lambda (symbol)
-	 (let ((value (default-value symbol)))
-	   (if (and (stringp value)
-		    (string-match "\
-\\`[\t\n ]*\\([0-9]+\\)[\t\n ]*[Xx][\t\n ]*\\([0-9]+\\)[\t\n ]*\\'"
-				  value))
-	       (cons (string-to-number (match-string 1 value))
-		     (string-to-number (match-string 2 value))))))
-  :set (lambda (symbol value)
-	 (set-default symbol
-		      (if (consp value)
-			  (format "%dx%d" (car value) (cdr value)))))
   :type '(radio (const :tag "Not specified" nil)
 		(cons :format "%v"
 		      (integer :format "Width: %v " :size 0 :value 16)
@@ -98,7 +88,7 @@
   :type '(integer :size 0))
 
 (defcustom w3m-favicon-type
-  (let ((types '(pbm png gif xpm bmp))
+  (let ((types '(gif png pbm xpm bmp))
 	type)
     (catch 'det
       (while types
@@ -106,7 +96,8 @@
 	      types (cdr types))
 	(if (if (featurep 'xemacs)
 		(featurep type)
-	      (image-type-available-p type))
+	      ;; Silence SXEmacs 22.1.14's byte compiler.
+	      (eval (list 'image-type-available-p (list 'quote type))))
 	    (throw 'det type)))))
   "*Image type of display favicon."
   :group 'w3m
@@ -131,6 +122,41 @@
   :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
@@ -200,7 +226,7 @@
 	   (w3m-favicon-convert
 	    (base64-decode-string (symbol-value icon)) 'ico))))
        ((or (string-match "\\`https?://" url)
-	    (and (string-match "\\`about://\\(header\\|source\\)/https?://"
+	    (and (string-match "\\`about://\\(?:header\\|source\\)/https?://"
 			       url)
 		 (setq url (substring url 15))))
 	(if w3m-icon-data
@@ -212,29 +238,64 @@
 
 (defun w3m-favicon-convert (data type)
   "Convert the favicon DATA in TYPE to the favicon image and return it."
-  (let* (height
-	 (img (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)))
-		(w3m-imagick-convert-data
+  (when (or (not (eq type 'ico))
+	    ;; Is it really in the ico format?
+	    (string-equal "\x00\x00\x01\x00" (substring data 0 4))
+	    ;; Some icons named favicon.ico are animated GIFs.
+	    (and (member (substring data 0 5) '("GIF87" "GIF89"))
+		 (setq type 'gif)))
+    (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))
-		 "-geometry"
-		 (or w3m-favicon-size
-		     (progn
-		       (setq height (w3m-static-if (featurep 'xemacs)
-					(face-height 'default)
-				      (frame-char-height)))
-		       (format "%dx%d" height height)))))))
-    (when img
-      (w3m-static-if (featurep 'xemacs)
-	  (make-glyph
-	   (make-image-instance (vector w3m-favicon-type :data img)))
-	(create-image img w3m-favicon-type t :ascent 'center)))))
+		 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.
@@ -249,11 +310,13 @@
 	(w3m-favicon-set-image (w3m-favicon-cache-favicon url)))
     (lexical-let ((url url)
 		  (type type)
-		  (target target))
+		  (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 (idata image)
+	  (let ((w3m-message-silent silent)
+		idata image)
 	    (if (and ok
 		     ;; Some broken servers provides empty contents.
 		     (>= (buffer-size) 4))
@@ -265,15 +328,8 @@
 	      (w3m-favicon-set-image image)
 	      (push (list url idata (current-time) w3m-favicon-image)
 		    w3m-favicon-cache-data)))))))
-  (w3m-static-when (boundp 'header-line-format)
-    ;; Emacs frame needs to be redisplayed to make favicon come out.
-    (run-at-time 1 nil
-		 (lambda (buffer)
-		   (if (and (buffer-live-p buffer)
-			    (eq (get-buffer-window buffer t)
-				(selected-window)))
-		       (w3m-force-window-update)))
-		 target)))
+  ;; 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."
Only in work/emacs-w3m-1.4.4/: w3m-favicon.elc
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: w3m-fb.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-filter.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-filter.el
--- work/emacs-w3m-1.4.4/w3m-filter.el	2005-02-15 20:04:44.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-filter.el	2013-04-19 13:57:13.000000000 +0900
@@ -1,7 +1,6 @@
-;;; w3m-filter.el --- filtering utility of advertisements on WEB sites.
+;;; w3m-filter.el --- filtering utility of advertisements on WEB sites -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001-2008, 2012, 2013 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -19,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -39,41 +38,258 @@
 
 (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\\.asahi\\.com/" w3m-filter-asahi-shimbun))
-  "Rules to filter advertisements on WEB sites."
+(defcustom w3m-filter-configuration
+  `((t
+     ("Strip Google's click-tracking code from link urls"
+      "Google ��� click-tracking ������������������������ url ������������������������")
+     "\\`https?://[a-z]+\\.google\\."
+     w3m-filter-google-click-tracking)
+    (t
+     ("Align table columns vertically to shrink the table width in Google"
+      "Google ���������������������������������������������������������������������")
+     "\\`http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
+     w3m-filter-google-shrink-table-width)
+    (t
+     ("Add name anchors that w3m can handle in all pages"
+      "������������������������ w3m ������������ name ������������������������������")
+     ""
+     w3m-filter-add-name-anchors)
+    (nil
+     ("Render <tfoot>...</tfoot> after <tbody>...</tbody>"
+      "������������������ <tfoot> ��� <tbody> ������������������������")
+     ""
+     w3m-filter-fix-tfoot-rendering)
+    (nil
+     ("Remove garbage in http://www.geocities.co.jp/*"
+      "http://www.geocities.co.jp/* ������������������������������")
+     "\\`http://www\\.geocities\\.co\\.jp/"
+     (w3m-filter-delete-regions
+      "<DIV ALIGN=CENTER>\n<!--*/GeoGuide/*-->" "<!--*/GeoGuide/*-->\n</DIV>"))
+    (nil
+     ("Remove ADV in http://*.hp.infoseek.co.jp/*"
+      "http://*.hp.infoseek.co.jp/* ������������������������������")
+     "\\`http://[a-z]+\\.hp\\.infoseek\\.co\\.jp/"
+     (w3m-filter-delete-regions "<!-- start AD -->" "<!-- end AD -->"))
+    (nil
+     ("Remove ADV in http://linux.ascii24.com/linux/*"
+      "http://linux.ascii24.com/linux/* ������������������������������")
+     "\\`http://linux\\.ascii24\\.com/linux/"
+     (w3m-filter-delete-regions
+      "<!-- DAC CHANNEL AD START -->" "<!-- DAC CHANNEL AD END -->"))
+    (nil
+     "A filter for Google"
+     "\\`http://\\(www\\|images\\|news\\|maps\\|groups\\)\\.google\\."
+     w3m-filter-google)
+    (nil
+     "A filter for Amazon"
+     "\\`https?://\\(?:www\\.\\)?amazon\\.\
+\\(?:com\\|co\\.\\(?:jp\\|uk\\)\\|fr\\|de\\)/"
+     w3m-filter-amazon)
+    (nil
+     ("A filter for Mixi.jp"
+      "���������������������������")
+     "\\`https?://mixi\\.jp" w3m-filter-mixi)
+    (nil
+     "A filter for http://eow.alc.co.jp/*/UTF-8*"
+     "\\`http://eow\\.alc\\.co\\.jp/[^/]+/UTF-8" w3m-filter-alc)
+    (nil
+     ("A filter for Asahi Shimbun"
+      "���������������������������")
+     "\\`http://www\\.asahi\\.com/" w3m-filter-asahi-shimbun)
+    (nil
+     "A filter for http://imepita.jp/NUM/NUM*"
+     "\\`http://imepita\\.jp/[0-9]+/[0-9]+" w3m-filter-imepita)
+    (nil
+     "A filter for http://allatanys.jp/*"
+     "\\`http://allatanys\\.jp/" w3m-filter-allatanys)
+    (nil
+     "A filter for Wikipedia"
+     "\\`http://.*\\.wikipedia\\.org/" w3m-filter-wikipedia)
+    (nil
+     ("Remove inline frames in all pages"
+      "������������������������������������������������������������������������")
+     ""
+     w3m-filter-iframe))
+  "List of filter configurations applied to web contents.
+Each filter configuration consists of the following form:
+
+\(FLAG DESCRIPTION REGEXP FUNCTION)
+
+FLAG
+  Non-nil means this filter is enabled.
+DESCRIPTION
+  Describe what this filter does.  The value may be a string or a list
+  of two strings; in the later case, those descriptions are written in
+  English and Japanese respectively, and only either one is displayed
+  in the customization buffer according to `w3m-language'.
+REGEXP
+  Regular expression to restrict this filter so as to run only on web
+  contents of which the url matches.
+FUNCTION
+  Filter function to run on web contents.  The value may be a function
+  or a list of a function and rest argument(s).  A function should take
+  at least one argument, a url of contents retrieved then, as the first
+  argument even if it is useless.  Use the later (i.e. a function and
+  arguments) if the function requires rest arguments."
   :group 'w3m
   :type '(repeat
-	  (cons :format "%v" :indent 4
-		(regexp :format "Regexp: %v\n" :size 0)
+	  :convert-widget w3m-widget-type-convert-widget
+	  (let ((locker (lambda (fn)
+			  `(lambda (&rest args)
+			     (when (and (not inhibit-read-only)
+					(eq (get-char-property (point) 'face)
+					    'widget-inactive))
+			       (when (and (not debug-on-error)
+					  (eventp (cadr args))
+					  (memq 'down
+						(event-modifiers (cadr args))))
+				 (setq before-change-functions
+				       `((lambda (from to)
+					   (setq before-change-functions
+						 ',before-change-functions)))))
+			       (error "The widget here is not active"))
+			     (apply #',fn args)))))
+	    `((group
+	       :indent 2
+
+	       ;; Work around a widget bug: the default value of `choice'
+	       ;; gets nil regardless of the type of items if it is within
+	       ;; (group :inline t ...).  Fixed in Emacs 24.4 (Bug#12670).
+	       :default-get (lambda (widget) '(t "Not documented" ".*" ignore))
+
+	       :value-create
+	       (lambda (widget)
+		 (widget-group-value-create widget)
+		 (unless (car (widget-value widget))
+		   (let ((children (widget-get widget :children)))
+		     (widget-specify-inactive
+		      (cadr (widget-get widget :args))
+		      (widget-get (car children) :to)
+		      (widget-get (car (last children)) :to)))))
+	       (checkbox
+		:format "\n%[%v%]"
+		:action
+		(lambda (widget &optional event)
+		  (let ((widget-edit-functions
+			 (lambda (widget)
+			   (let* ((parent (widget-get widget :parent))
+				  (child (cadr (widget-get parent :args))))
+			     (if (widget-value widget)
+				 (progn
+				   (widget-specify-active child)
+				   (widget-put child :inactive nil))
+			       (widget-specify-inactive
+				child
+				(widget-get widget :to)
+				(widget-get
+				 (car (last
+				       (widget-get
+					(car (last
+					      (widget-get parent :children)))
+					:children))) :to)))))))
+		    (widget-checkbox-action widget event))))
+	       (group
+		:inline t
 		(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))))))
+		 :format " %v"
+		 (string :format "%v")
+		 (group ,@(if (equal "Japanese" w3m-language)
+			      '((sexp :format "") (string :format "%v"))
+			    '((string :format "%v") (sexp :format ""))))
+		 (const :format "Not documented\n" nil))
+		(regexp :format "Regexp matching url: %v")
+		(choice
+		 :tag "Type" :format "Function %[Type%]: %v"
+		 :action ,(funcall locker 'widget-choice-action)
+		 (function :tag "Function with no rest arg" :format "%v")
+		 (group
+		  :tag "Function and rest arg(s)" :indent 0 :offset 4
+		  (function :format "%v")
+		  (editable-list
+		   :inline t
+		   :entry-format "%i %d Arg: %v"
+		   :insert-before
+		   ,(funcall locker 'widget-editable-list-insert-before)
+		   :delete-at
+		   ,(funcall locker 'widget-editable-list-delete-at)
+		   (sexp :format "%v"))))))))))
+
+(defcustom w3m-filter-rules nil
+  "Rules to filter advertisements on WEB sites.
+This variable is semi-obsolete; use `w3m-filter-configuration' instead."
+  :group 'w3m
+  :type '(repeat
+	  (group :format "%v" :indent 2
+		 (regexp :format "Regexp: %v\n" :value ".*" :size 0)
+		 (choice
+		  :tag "Filtering Rule"
+		  (group :inline t
+			 :tag "Delete regions surrounded with these patterns"
+			 (const :format "Function: %v\n"
+				w3m-filter-delete-regions)
+			 (string :format "Start: %v\n" :size 0
+				 :value "not a regexp")
+			 (string :format "  End: %v\n" :size 0
+				 :value "not a regexp"))
+		  (function :tag "Filter with a user defined function"
+			    :format "Function: %v\n" :size 0)))))
+
+(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
-    (catch 'apply-filtering-rule
-      (dolist (elem w3m-filter-rules)
-	(when (string-match (car elem) url)
-	  (throw 'apply-filtering-rule
-		 (apply (cadr elem) url (cddr elem))))))))
+    (dolist (elem (append w3m-filter-rules
+			  (delq nil
+				(mapcar
+				 (lambda (config)
+				   (when (car config)
+				     (if (consp (nth 3 config))
+					 (cons (nth 2 config) (nth 3 config))
+				       (list (nth 2 config) (nth 3 config)))))
+				 w3m-filter-configuration))))
+      (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."
@@ -86,7 +302,132 @@
       (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-google-click-tracking (url)
+  "Strip Google's click-tracking code from link urls"
+  (goto-char (point-min))
+  (while (re-search-forward "\\(<a[\t\n ]+\\(?:[^\t\n >]+[\t\n ]+\\)*\
+href=\"\\)\\(?:[^\"]+\\)?/\\(?:imgres\\?imgurl\\|url\\?\\(?:q\\|url\\)\\)=\
+\\([^&]+\\)[^>]+>" nil t)
+    ;; In a search result Google encodes some special characters like "+"
+    ;; and "?" to "%2B" and "%3F" in a real url, so we need to decode them.
+    (insert (w3m-url-decode-string
+	     (prog1
+		 (concat (match-string 1) (match-string 2) "\">")
+	       (delete-region (match-beginning 0) (match-end 0)))))))
+
+(defun w3m-filter-google-shrink-table-width (url)
+  "Align table columns vertically to shrink the table width."
+  (let ((case-fold-search t)
+	last)
+    (goto-char (point-min))
+    (while (re-search-forward "<tr[\t\n\r >]" nil t)
+      (when (w3m-end-of-tag "tr")
+	(save-restriction
+	  (narrow-to-region (goto-char (match-beginning 0))
+			    (match-end 0))
+	  (setq last nil)
+	  (while (re-search-forward "<td[\t\n\r >]" nil t)
+	    (when (w3m-end-of-tag "td")
+	      (setq last (match-end 0))
+	      (replace-match "<tr>\\&</tr>")))
+	  (when last
+	    (goto-char (+ 4 last))
+	    (delete-char 4))
+	  (goto-char (point-max)))))
+    ;; Remove rowspan and width specs, and <br>s.
+    (goto-char (point-min))
+    (while (re-search-forward "<table[\t\n\r >]" nil t)
+      (when (w3m-end-of-tag "table")
+	(save-restriction
+	  (narrow-to-region (goto-char (match-beginning 0))
+			    (match-end 0))
+	  (while (re-search-forward "\
+\[\t\n\r ]*\\(?:\\(?:rowspan\\|width\\)=\"[^\"]+\"\\|<br>\\)[\t\n\r ]*"
+				    nil t)
+	    ;; Preserve a space at the line-break point.
+	    (replace-match " "))
+	  ;; Insert a space between ASCII and non-ASCII characters
+	  ;; and after a comma.
+	  (goto-char (point-min))
+	  (while (re-search-forward "\
+\\([!-;=?-~]\\)\\([^ -~]\\)\\|\\([^ -~]\\)\\([!-;=?-~]\\)\\|\\(,\\)\\([^ ]\\)"
+				    nil t)
+	    (forward-char -1)
+	    (insert " ")
+	    (forward-char))
+	  (goto-char (point-max)))))))
+
+(defun w3m-filter-add-name-anchors (url)
+  ;;  cf. [emacs-w3m:11153]
+  "Add name anchors that w3m can handle.
+This function adds ``<a name=\"FOO_BAR\"></a>'' in front of
+``<TAG ... id=\"FOO_BAR\" ...>FOO BAR</TAG>'' in the current buffer."
+  (let ((case-fold-search t) names st nd name)
+    (goto-char (point-min))
+    (while (re-search-forward "<a[\t\n\r ]+\\(?:[^\t\n\r >]+[\t\n\r ]+\\)*\
+href=\"#\\([a-z][-.0-9:_a-z]*\\)\"" nil t)
+      (add-to-list 'names (match-string 1)))
+    (when names
+      (setq names (concat "<\\(?:[^\t\n\r >]+\\)\
+\[\t\n\r ]+\\(?:[^\t\n\r >]+[\t\n\r ]+\\)*[Ii][Dd]=\"\\("
+			  (mapconcat 'regexp-quote names "\\|")
+			  "\\)\"")
+	    case-fold-search nil)
+      (goto-char (point-min))
+      (while (re-search-forward names nil t)
+	(goto-char (setq st (match-beginning 0)))
+	(setq nd (match-end 0)
+	      name (match-string 1))
+	(insert "<a name=" name "></a>")
+	(goto-char (+ nd (- (point) st)))))))
+
+(defun w3m-filter-fix-tfoot-rendering (url &optional recursion)
+  "Render <tfoot>...</tfoot> after <tbody>...</tbody>."
+  (let ((table-exists recursion)
+	(mark "!-- emacs-w3m-filter ")
+	(tbody-end (make-marker))
+	tfoots)
+    (goto-char (if table-exists (match-end 0) (point-min)))
+    (while (or table-exists (re-search-forward "<table[\t\n\r >]" nil t))
+      (setq table-exists nil)
+      (save-restriction
+	(if (w3m-end-of-tag "table")
+	    (narrow-to-region (match-beginning 0) (match-end 0))
+	  (narrow-to-region (match-beginning 0) (point-max)))
+	(goto-char (1+ (match-beginning 0)))
+	(insert mark)
+	(while (re-search-forward "<table[\t\n\r >]" nil t)
+	  (w3m-filter-fix-tfoot-rendering url t))
+	(goto-char (point-min))
+	(while (search-forward "</tbody>" nil t)
+	  (set-marker tbody-end (match-end 0))
+	  (goto-char (1+ (match-beginning 0)))
+	  (insert mark))
+	(unless (bobp)
+	  (setq tfoots nil)
+	  (goto-char (point-min))
+	  (while (re-search-forward "<tfoot[\t\n\r >]" nil t)
+	    (when (w3m-end-of-tag "tfoot")
+	      (push (match-string 0) tfoots)
+	      (delete-region (match-beginning 0) (match-end 0))))
+	  (when tfoots
+	    (goto-char tbody-end)
+	    (dolist (tfoot (nreverse tfoots))
+	      (insert "<" mark (substring tfoot 1)))))
+	(goto-char (point-max))))
+    (set-marker tbody-end nil)
+    (unless recursion
+      (goto-char (point-min))
+      (while (search-forward mark nil t)
+	(delete-region (match-beginning 0) (match-end 0))))))
+
 (defun w3m-filter-asahi-shimbun (url)
   "Convert entity reference of UCS."
   (when w3m-use-mule-ucs
@@ -101,4 +442,211 @@
 	  (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
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-form.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-form.el
--- work/emacs-w3m-1.4.4/w3m-form.el	2005-03-17 16:31:32.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-form.el	2013-04-08 18:59:18.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; w3m-form.el --- Stuffs to handle <form> tag
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001-2013 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          Yuuichi Teranishi  <teranisi@gohome.org>,
@@ -23,9 +22,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -71,6 +70,20 @@
 		 (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."
@@ -88,12 +101,14 @@
 			 (sexp :tag "Expression checks the current page"))
 		 (function :tag "Major mode")))))
 
-(defface w3m-form-face
+(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)
@@ -149,17 +164,25 @@
 (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:
 
-(defsubst w3m-form-normalize-action (action url)
+(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)
-    (and url
-	 (string-match w3m-url-components-regexp url)
-	 (substring url 0 (or (match-beginning 6)
-			      (match-beginning 8))))))
+    (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."
@@ -172,29 +195,29 @@
 	  (or enctype 'application/x-www-form-urlencoded)
 	  nil))
 
-(defsubst w3m-form-p (obj)
+(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)))
 
-(defsubst w3m-form-set-method (form method)
+(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)))
+  `(aref ,form 1))
 (defmacro w3m-form-action (form)
-  (` (aref (, form) 2)))
+  `(aref ,form 2))
 (defmacro w3m-form-charlst (form)
-  (` (aref (, form) 3)))
+  `(aref ,form 3))
 (defmacro w3m-form-enctype (form)
-  (` (aref (, form) 4)))
+  `(aref ,form 4))
 (defmacro w3m-form-plist (form)
-  (` (aref (, form) 5)))
-(defsubst w3m-form-put-property (form name property value)
+  `(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))
@@ -202,24 +225,25 @@
 			      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))))
+  `(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)))))
+  `(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)
+  `(cdr (w3m-form-get-property ,form ,id :value)))
+(defun w3m-form-get-by-name (form id 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))
+      (when (eq id (car 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)
@@ -324,11 +348,12 @@
 	(mapconcat (lambda (elem)
 		     (setq elem (cdr elem))
 		     (format "%s=%s"
-			     (w3m-url-encode-string (car elem) coding)
+			     (w3m-url-encode-string (car elem) coding t)
 			     (w3m-url-encode-string (if (stringp (cdr elem))
 							(cdr elem)
 						      "")
-						    coding)))
+						    coding
+						    t)))
 		   bufs "&")))))
 
 (defun w3m-form-resume (forms)
@@ -343,7 +368,7 @@
 	  (let ((fid (get-text-property (point) 'w3m-form-field-id)))
 	    (when (and fid
 		       (string-match "\
-fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]+\\)/id=\\(.*\\)$"
+fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
 				     fid))
 	      (let ((form (nth (string-to-number (match-string 1 fid))
 			       forms))
@@ -369,7 +394,7 @@
 		    (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)))
+		    (let ((value (w3m-form-get-by-name form id name)))
 		      (when value
 			(w3m-form-replace
 			 (if (string= value (nth 4 (w3m-action (point))))
@@ -427,9 +452,9 @@
 (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."
-      (add-text-properties start end (append '(face w3m-form-face)
-					     properties)))))
+      "Make button on the region from START to END with PROPERTIES."
+      (w3m-add-text-properties start end
+			       (append '(face w3m-form) properties)))))
 
 ;;; w3mmee
 ;;
@@ -515,8 +540,9 @@
   (when w3m-form-treat-textarea-size
     (save-excursion
       (goto-char (point-min))
-      (let (form fid start end type name rows start-column end-column
-		 hseq abs-hseq buffer-read-only text id filename)
+      (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))
@@ -524,7 +550,7 @@
 	      (and
 	       fid
 	       (string-match
-		"fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]+\\)/id=\\(.*\\)$"
+		"fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
 		fid))
 	    (setq form (nth (string-to-number (match-string 1 fid))
 			    w3m-current-forms)
@@ -534,6 +560,7 @@
 	    (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)
@@ -551,19 +578,22 @@
 		    (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)
-		     face w3m-form-face
 		     w3m-action (w3m-form-input-textarea ,form ,hseq)
 		     w3m-submit (w3m-form-submit ,form ,id ,name
-						 (w3m-form-get ,form ,id))
+						 (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-file-name ,filename
+		     w3m-form-readonly ,readonly)))
 		(when (setq text (w3m-form-get form id))
 		  (w3m-form-textarea-replace hseq text))))))))))
 
@@ -600,8 +630,7 @@
 	      (setq action (w3m-url-transfer-encode-string
 			    (w3m-decode-anchor-string action)
 			    (if charset
-				(w3m-charset-to-coding-system charset)
-			      w3m-current-coding-system))))
+				(w3m-charset-to-coding-system charset)))))
 	    (if (setq form (cdr (assq fid forms)))
 		(progn
 		  (setf (w3m-form-method form) (or method "get"))
@@ -651,10 +680,10 @@
 	    (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)
-	     `(face w3m-form-face
-		    w3m-action (w3m-form-input-map ,maps ,usemap))))))
+	     `(w3m-action (w3m-form-input-map ,maps ,id ,usemap))))))
        ((string= tag "/input_alt")
 	(replace-match ""))
        ((string= tag "input_alt")
@@ -669,6 +698,7 @@
 			       (rows :integer)		 ; textarea
 			       (top_mergin :integer)	 ; textarea
 			       (checked :bool) ; checkbox, radio
+			       (readonly :bool)
 			       no_effect       ; map
 			       name value)
 	  (incf id)
@@ -698,9 +728,13 @@
 		 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-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-get ,form ,id)
+					       w3m-form-new-session
+					       w3m-form-download)
 		   w3m-anchor-sequence ,abs-hseq))))
 	     ((string= type "reset")
 	      (w3m-form-make-button
@@ -717,30 +751,34 @@
 				 (w3m-url-decode-string value
 							w3m-current-coding-system)
 				 w3m-output-coding-system))
-		(setq textareas (cons (list textareanumber form id name)
+		(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))
+				 (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)
-		 face w3m-form-face
 		 w3m-action (w3m-form-input-textarea ,form ,hseq)
 		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id))
+					     (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-file-name ,filename
+		 w3m-form-readonly ,readonly)))
 	     ((string= type "select")
 	      (when (if (eq w3m-type 'w3mmee)
 			(when value
@@ -749,79 +787,93 @@
 			  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)
-		   face w3m-form-face
 		   w3m-action (w3m-form-input-select ,form ,id ,name)
 		   w3m-submit (w3m-form-submit ,form ,id ,name
-					       (w3m-form-get ,form ,id))
+					       (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)
-		 face w3m-form-face
 		 w3m-action (w3m-form-input-password ,form ,id ,name)
 		 w3m-submit (w3m-form-submit ,form ,id ,name
-					     (w3m-form-get ,form ,id))
-		 w3m-anchor-sequence ,abs-hseq)))
+					     (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)
-		 face w3m-form-face
 		 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-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)
-		 face w3m-form-face
 		 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))
+					      ,form ,id ,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)
-		 face w3m-form-face
 		 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-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)
-		 face w3m-form-face
 		 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-anchor-sequence ,abs-hseq)))))))))
+					     (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))
@@ -862,17 +914,15 @@
 	      (when textareainfo
 		(setq start (point))
 		(skip-chars-forward "^<")
-		(setq end (point))
-		(with-temp-buffer
-		  (insert-buffer-substring buffer start end)
-		  (w3m-decode-entities)
-		  (goto-char (point-min))
-		  (while (search-forward "\r\n" nil t) (replace-match "\n"))
-		  (setq text (buffer-string)))
-		(w3m-form-put (nth 0 textareainfo)
-			      (nth 1 textareainfo)
-			      (nth 2 textareainfo)
-			      text)))))))
+		(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)
@@ -891,7 +941,7 @@
 		  (next-single-property-change start 'w3m-action))))
 	 (prop (text-properties-at start))
 	 (p (point))
-	 (buffer-read-only))
+	 (inhibit-read-only t))
     (goto-char start)
     (insert (setq string
 		  (if invisible
@@ -910,22 +960,32 @@
       (goto-char p))))
 
 (defun w3m-form-input (form id name type width maxlength value)
-  (save-excursion
-    (let* ((fvalue (w3m-form-get form id))
-	   (input (read-from-minibuffer (concat (upcase type) ": ") fvalue)))
-      (w3m-form-put form id name input)
-      (w3m-form-replace input))))
+  (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)
-  (let* ((fvalue (w3m-form-get form id))
-	 (input (read-passwd (concat "PASSWORD"
-				     (if fvalue
-					 " (default is no change)")
-				     ": ")
-			     nil
-			     fvalue)))
-    (w3m-form-put form id name input)
-    (w3m-form-replace input 'invisible)))
+  (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)))
@@ -936,10 +996,10 @@
       (w3m-form-put form id name (cons value fvalue))
       (w3m-form-replace "*"))))
 
-(defsubst w3m-form-field-parse (fid)
+(defun w3m-form-field-parse (fid)
   (when (and fid
 	     (string-match
-	      "fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]+\\)/id=\\(.*\\)$"
+	      "fid=\\([^/]+\\)/type=\\([^/]+\\)/name=\\([^/]*\\)/id=\\(.*\\)$"
 	      fid))
     (list (match-string 1 fid)
 	  (match-string 2 fid)
@@ -969,9 +1029,10 @@
   (w3m-form-replace "*"))
 
 (defun w3m-form-input-file (form id name value)
-  (let ((input (read-file-name "File name: "
-			       (or (cdr (w3m-form-get form id))
-				   "~/"))))
+  (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)))
 
@@ -1030,7 +1091,7 @@
     (goto-char p)))
 
 (defun w3m-form-textarea-info ()
-  "Return a list of (ID NAME LINE) for current text area."
+  "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
@@ -1038,7 +1099,8 @@
 	(incf lines))
       (list (get-text-property (point) 'w3m-form-id)
 	    (get-text-property (point) 'w3m-form-name)
-	    lines))))
+	    lines
+	    (get-text-property (point) 'w3m-form-readonly)))))
 
 (defvar w3m-form-input-textarea-map nil)
 (unless w3m-form-input-textarea-map
@@ -1053,32 +1115,42 @@
     'w3m-form-input-textarea-save))
 
 (defun w3m-form-input-textarea-filename (url id)
-  (let ((file "")
-	;; Interdit chars of Windows
-	(replace (regexp-opt '("\\" "/" ":" "*" "?" "\"" "<" ">" "|"))))
-    (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))))
-    (setq file (concat file id ".txt"))
-    (convert-standard-filename file)))
+  (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)
+(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 (or w3m-form-use-textarea-backup-p
-		  (and (eq this-command 'w3m-form-input-textarea-save)
-		       (y-or-n-p "Really save this buffer? ")))
-	  (let ((buffer-file-coding-system w3m-form-input-textarea-coding-system)
-		(file-coding-system w3m-form-input-textarea-coding-system)
-		(coding-system-for-write w3m-form-input-textarea-coding-system))
+	(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)
@@ -1100,19 +1172,20 @@
 	(wincfg w3m-form-input-textarea-wincfg)
 	(file w3m-form-input-textarea-file)
 	info)
-    (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-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)))))
+    (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."
@@ -1181,6 +1254,36 @@
 `\\<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)))
@@ -1188,15 +1291,14 @@
 	 (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-textarea-buffer-lines)))))
+	 (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)))
-	 (backup-p (w3m-form-use-textarea-backup-p))
+	 (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
@@ -1218,9 +1320,8 @@
     (unless (consp buffer)
       (when (and backup-p (file-exists-p file) (file-readable-p file))
 	(with-temp-buffer
-	  (let ((buffer-file-coding-system coding)
-		(file-coding-system coding)
-		(coding-system-for-read coding))
+	  (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)
@@ -1229,11 +1330,17 @@
 		      (goto-char (abs (w3m-compare-strings
 				       before 0 (length before)
 				       value 0 (length value))))
-		      (y-or-n-p
-		       "The saved text for this form exists. Use it? ")))
+		      (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)
@@ -1249,13 +1356,20 @@
 	     (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-textarea-buffer-lines))))
-      (select-window (next-window))
+      ;; 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))))))
 
@@ -1326,13 +1440,10 @@
 		   (file-writable-p file))
 	  (delete-file file))))))
 
-(defun w3m-form-set-number (w3mbuf count)
+(defun w3m-form-set-number (w3mbuf newname)
   "Change parent w3m buffer in form buffers"
   (save-current-buffer
-    (let* ((newname (if (= count 1)
-			"*w3m*"
-		      (format "*w3m*<%d>" count)))
-	   (newbuff (get-buffer newname)))
+    (let ((newbuff (get-buffer newname)))
       (when newbuff
 	(dolist (buffer (buffer-list))
 	  (set-buffer buffer)
@@ -1400,6 +1511,8 @@
     '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)
@@ -1471,7 +1584,7 @@
 	major-mode 'w3m-form-input-select-mode)
   (setq buffer-read-only t)
   (use-local-map w3m-form-input-select-keymap)
-  (run-hooks 'w3m-form-input-select-mode-hook))
+  (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))
@@ -1521,8 +1634,9 @@
 	    (insert "\n")))
 	(goto-char (point-min))
 	(while (and (not (eobp))
-		    (not (equal cur (get-text-property (point)
-						       'w3m-form-select-value))))
+		    (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)
@@ -1574,6 +1688,8 @@
     '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)
@@ -1636,10 +1752,10 @@
 	major-mode 'w3m-form-input-map-mode)
   (setq buffer-read-only t)
   (use-local-map w3m-form-input-map-keymap)
-  (run-hooks 'w3m-form-input-map-mode-hook))
+  (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))
+(defun w3m-form-input-map (form id name)
+  (let* ((value (w3m-form-get-by-name form id name))
 	 (urlname (format "%s:%s" w3m-current-url name))
 	 (cur-win (selected-window))
 	 (wincfg (current-window-configuration))
@@ -1710,35 +1826,55 @@
 	  (setq files (cons file files))))
       files)))
 
-(defun w3m-form-submit (form &optional id name value)
-  (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))
-	  ((eq 'get (w3m-form-method form))
-	   (w3m-goto-url
-	    (concat url "?" (w3m-form-make-form-data form))))
-	  ((eq 'post (w3m-form-method form))
-	   (w3m-goto-url url 'reload nil
-			 (w3m-form-make-form-data form)
-			 w3m-current-url))
-	  (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-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)))))))))
 
-(defsubst w3m-form-real-reset (form sexp)
+(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))
Only in work/emacs-w3m-1.4.4/: w3m-fsf.el
Only in work/emacs-w3m-1.4.4/: w3m-fsf.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-hist.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-hist.el
--- work/emacs-w3m-1.4.4/w3m-hist.el	2004-12-24 17:17:05.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-hist.el	2012-02-10 16:48:43.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; w3m-hist.el --- the history management system for emacs-w3m
 
-;; Copyright (C) 2001, 2002, 2003, 2004
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001-2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -19,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -35,17 +34,7 @@
 
 (eval-when-compile
   (require 'cl))
-
-(eval-and-compile
-  (dont-compile
-    (condition-case nil
-	:symbol-for-testing-whether-colon-keyword-is-available-or-not
-      (void-variable
-       (let (w3m-colon-keywords)
-	 (load "w3m-kwds.el" nil t t)
-	 (while w3m-colon-keywords
-	   (set (car w3m-colon-keywords) (car w3m-colon-keywords))
-	   (setq w3m-colon-keywords (cdr w3m-colon-keywords))))))))
+(require 'w3m-util)
 
 (defcustom w3m-history-reuse-history-elements nil
   "Non-nil means reuse the history element when re-visiting the page.
@@ -201,14 +190,14 @@
   "Extract a history element associated with URL from `w3m-history-flat'."
   (assoc url w3m-history-flat))
 
-(defsubst w3m-history-set-current (position)
+;; 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)))
 
-;; Functions for internal use.
 (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
@@ -534,12 +523,12 @@
 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.  If
+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 rest)
+	position flat element props window-start rest)
     (set-buffer buffer)
     (when w3m-history
       (setq position (copy-sequence (cadar w3m-history))
@@ -553,11 +542,19 @@
 	    (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 from the new `w3m-history-flat'.
+	;; 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))
-	  (setcdr (cddr element) nil)
+		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)))))
@@ -609,7 +606,7 @@
 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."
-  (inline (w3m-history-add-properties (list keyword value) not-buffer-local)))
+  (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.
@@ -621,7 +618,7 @@
     (while properties
       (setq rest (cons nil (cons (car properties) rest))
 	    properties (cddr properties)))
-    (inline (w3m-history-add-properties (nreverse rest) not-buffer-local))))
+    (w3m-history-add-properties (nreverse rest) not-buffer-local)))
 
 (defun w3m-history-store-position ()
   "Store the current cursor position into the current history element.
@@ -629,9 +626,31 @@
 position.  Naturally, those should be treated as buffer-local."
   (interactive)
   (when (cadar w3m-history)
-    (w3m-history-add-properties (list :window-start (window-start)
-				      :position (point)))
-    (when (interactive-p)
+    ;; Emacs lies about the column number in the results of
+    ;; the functions `current-column', `window-hscroll', etc. if there
+    ;; are images; it is likely larger than the position of the cursor
+    ;; actually visible, and restoring it causes h-scrolling too much.
+    ;; So, we store the position of an image if the cursor follows.
+    (let ((column (current-column))
+	  (hscroll (window-hscroll))
+	  pos)
+      (when (cond ((bobp) nil)
+		  ((get-text-property (point) 'w3m-image) nil)
+		  ((get-text-property (1-(point)) 'w3m-image)
+		   (goto-char (1- (point))))
+		  ((setq pos (previous-single-property-change
+			      (point) 'w3m-image nil (point-at-bol)))
+		   (unless (= pos (point-at-bol))
+		     (goto-char (1- pos)))))
+	(setq pos (current-column))
+	(move-to-column column)
+	(setq hscroll (max (- hscroll (- column pos)) 0)
+	      column pos))
+      (w3m-history-add-properties
+       (list :window-start (window-start)
+	     :position (cons (count-lines (point-min) (point-at-bol)) column)
+	     :window-hscroll hscroll)))
+    (when (w3m-interactive-p)
       (message "The current cursor position saved"))))
 
 (defun w3m-history-restore-position ()
@@ -645,11 +664,17 @@
       (cond ((and start
 		  (setq position (w3m-history-plist-get :position)))
 	     (when (<= start (point-max))
+	       (goto-char (point-min))
+	       (forward-line (car position))
 	       (setq window (get-buffer-window (current-buffer) 'all-frames))
 	       (when window
-		 (set-window-start window start))
-	       (goto-char (min position (point-max)))))
-	    ((interactive-p)
+		 (set-window-start window start)
+		 (set-window-hscroll
+		  window (or (w3m-history-plist-get :window-hscroll) 0)))
+	       (move-to-column (cdr position))
+	       (let ((deactivate-mark nil))
+		 (run-hooks 'w3m-after-cursor-move-hook))))
+	    ((w3m-interactive-p)
 	     (message "No cursor position saved"))))))
 
 (defun w3m-history-minimize ()
@@ -664,6 +689,35 @@
 	    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"))
Only in work/emacs-w3m-1.4.4/: w3m-hist.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-image.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-image.el
--- work/emacs-w3m-1.4.4/w3m-image.el	2003-11-18 10:58:33.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-image.el	2009-09-02 12:06:48.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-image.el --- Image conversion routines.
 
-;; Copyright (C) 2001, 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -56,23 +57,84 @@
   (defvar w3m-work-buffer-name)
   (defvar w3m-work-buffer-list))
 
-(defcustom w3m-imagick-convert-program (w3m-which-command "convert")
+(defcustom w3m-imagick-convert-program (if noninteractive
+					   nil
+					 (w3m-which-command "convert"))
   "*Program name of ImageMagick's `convert'."
   :group 'w3m
-  :type '(string :size 0))
+  :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
+  (when (w3m-imagick-convert-program-available-p)
     (let* ((in-file (make-temp-name
 		     (expand-file-name "w3mel" w3m-profile-directory)))
-	   (file-coding-system 'binary)
 	   (buffer-file-coding-system 'binary)
 	   (coding-system-for-read 'binary)
 	   (coding-system-for-write 'binary)
@@ -80,17 +142,22 @@
 	   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
-					    (concat to-type ":-")
-					  "-")))))
+      (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))
@@ -113,7 +180,7 @@
 (defun w3m-imagick-start-convert-data (handler
 				       data from-type to-type &rest args)
   (w3m-process-do-with-temp-buffer
-      (success (progn
+      (success (when (w3m-imagick-convert-program-available-p)
 		 (set-buffer-multibyte nil)
 		 (insert data)
 		 (apply 'w3m-imagick-start-convert-buffer
@@ -127,27 +194,30 @@
 			  (expand-file-name "w3mel" w3m-profile-directory)))
 		(out-buffer (current-buffer)))
     (setq w3m-current-url "non-existent")
-    (let ((file-coding-system 'binary)
-	  (coding-system-for-write 'binary)
+    (let ((coding-system-for-write 'binary)
 	  (buffer-file-coding-system 'binary)
 	  jka-compr-compression-info-list
-	  jam-zcat-filename-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
-						   (concat to-type ":-")
-						 "-"))))))
+		   (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)))
Only in work/emacs-w3m-1.4.4/: w3m-image.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-lnum.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-lnum.el
--- work/emacs-w3m-1.4.4/w3m-lnum.el	2005-03-25 08:10:05.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-lnum.el	2013-01-23 09:34:01.000000000 +0900
@@ -1,8 +1,9 @@
 ;;; w3m-lnum.el --- Operations using link numbers
 
-;; Copyright (C) 2004, 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2004-2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;;          Andrey Kotlarski <m00naticus@gmail.com>
 ;; Keywords: w3m, WWW, hypermedia
 
 ;; This file is a part of emacs-w3m.
@@ -18,117 +19,1097 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 operations using link
-;; numbers.
+;; 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-lnum-goto'
+;; for quickly navigating to links, form fields images or buttons;
+;; `w3m-lnum-follow' for visiting links, activating form fields,
+;; toggling images or pushing buttons and `w3m-lnum-universal' for
+;; selecting whatever element and then giving relevant options
+;; depending on what is selected.
 
 ;;; Usage:
 
-;; Install this file to an appropriate directory, and add these
-;; expressions to your ~/.emacs-w3m.
-
-;;      (autoload 'w3m-link-numbering-mode "w3m-lnum" nil t)
-;;	(add-hook 'w3m-mode-hook 'w3m-link-numbering-mode)
+;; Install this file to an appropriate directory, and add this
+;; expression to your ~/.emacs-w3m if you want automatically
+;; activating this minor mode
+;; (w3m-lnum-mode 1)
+;; or alternatively this to your .emacs file before loading w3m
+;; (add-hook 'w3m-mode-hook 'w3m-lnum-mode)
+;; or just use interactive command `w3m-lnum-mode' to toggle mode.
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'w3m)
 
-(defface w3m-link-numbering-face
-  '((((class color) (background light)) (:foreground "gray60"))
-    (((class color) (background dark)) (:foreground "gray50")))
+(defface w3m-lnum
+  '((((class color) (min-colors 16) (background light))
+     (:foreground "gray60"))
+    (((class color) (min-colors 16) (background dark))
+     (:foreground "gray50"))
+    (t (:foreground "gray")))
   "Face used to highlight link numbers."
   :group 'w3m-face)
 
-(defcustom w3m-link-numbering-mode-hook nil
-  "*Hook run after `w3m-link-numbering-mode' initialization."
+(defface w3m-lnum-minibuffer-prompt
+  '((((class color) (background light) (type tty))
+     (:foreground "blue"))
+    (((class color) (background dark)) (:foreground "cyan"))
+    (t (:foreground "medium blue")))
+  "Face for w3m lnum minibuffer prompt."
+  :group 'w3m-face)
+
+(defface w3m-lnum-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-lnum-mode'."
+  :group 'w3m-face)
+
+(defcustom w3m-lnum-mode-hook nil
+  "Hook run after command `w3m-lnum-mode' initialization."
   :group 'w3m
   :type 'hook)
 
-(defvar w3m-link-numbering-mode-map
-  (let ((keymap (make-sparse-keymap)))
-    (substitute-key-definition 'w3m-view-this-url
-			       'w3m-move-numbered-anchor
-			       keymap w3m-mode-map)
-    keymap)
-  "Keymap used when `w3m-link-numbering-mode' is active.")
+(defcustom w3m-lnum-quick-browsing 'quick-numbers
+  "If non-nil, do aggressive selection.  Possible values are:
+`quick-numbers' quick selection only when entering numbers
+`quick-filter' ditto only when filtering
+`quick-all' always quick selecting"
+  :group 'w3m
+  :type '(radio (const :format "%v " nil)
+		(const :format "%v " quick-numbers)
+		(const :format "%v " quick-filter)
+		(const :format "%v" quick-all)))
+
+(defcustom w3m-lnum-context-alist
+  '(("news.ycombinator.com" . 2) ("reddit.com" . 1))
+  "Alist specifying number of additional items to be numbered after \
+filtering over an url being matched by the car."
+  :group 'w3m
+  :type 'alist)
+
+(defvar w3m-lnum-actions-custom-type
+  '(repeat (choice :format "%[Value Menu%] %v"
+		   (string :tag "Information line")
+		   (group :tag "Keycode and Action" :indent 2
+			  (character :tag "Key")
+			  function
+			  (string :tag "Prompt")))))
+
+(defcustom w3m-lnum-actions-general
+  '("----  Default   ----"
+    (?F (lambda (info) (push-mark (point))
+	  (goto-char (cadr info))) "Move to anchor"))
+  "Alist specifying keycodes and available actions over selected anchor."
+  :group 'w3m
+  :type w3m-lnum-actions-custom-type)
+
+(defcustom w3m-lnum-actions-image-alist
+  '("----  Image  ----"
+    (?t (lambda (info) (goto-char (cadr info))
+	  (w3m-toggle-inline-image)) "Goto image and toggle it")
+    (?T (lambda (info) (save-excursion (goto-char (cadr info))
+				  (w3m-toggle-inline-image)))
+	"Toggle")
+    (?O (lambda (info) (w3m-external-view (nth 2 info))) "View externally")
+    (?S (lambda (info) (w3m-download (nth 2 info))) "Save")
+    (?r (lambda (info) (w3m-lnum-remove-overlays) ;some images invoke scrolling
+	  (goto-char (cadr info))
+	  (w3m-resize-image-interactive (car info))) "Resize"))
+  "Alist specifying keycodes and available actions over a selected image."
+  :group 'w3m
+  :type w3m-lnum-actions-custom-type)
+
+(defcustom w3m-lnum-actions-link-alist
+  '("----  Link   ----"
+    (?g (lambda (info) (w3m-lnum-visit info)) "Visit")
+    (?G (lambda (info) (setq mode-line-format original-mode-line-format)
+	  (w3m-lnum-remove-overlays)
+	  (w3m-lnum-visit info t)) "Visit in new session")
+    (?v (lambda (info) (w3m-lnum-visit info nil t)) "Edit and visit")
+    (?V (lambda (info) (setq mode-line-format original-mode-line-format)
+	  (w3m-lnum-remove-overlays)
+	  (w3m-lnum-visit info t t))
+	"Edit and visit in new session")
+    (?e (lambda (info) (w3m-edit-url (car info))) "Edit page")
+    (?s (lambda (info) (save-excursion
+		    (goto-char (cadr info))
+		    (w3m-download-this-url))) "Download")
+    (?b (lambda (info)
+	  (w3m-bookmark-add
+	   (car info)
+	   (let ((pos (cadr info)))
+	     (if (= pos 16)		; 0th anchor selected
+		 w3m-current-title
+	       (buffer-substring-no-properties
+		(previous-single-property-change (1+ pos)
+						 'w3m-href-anchor)
+		(next-single-property-change pos
+					     'w3m-href-anchor))))))
+	"Add to bookmarks")
+    (?u (lambda (info)
+	  (let ((url (car info)))
+	    (kill-new url)
+	    (w3m-message "%s%s" (let ((im-alt (nth 3 info)))
+				  (if (zerop (length im-alt)) ""
+				    (concat im-alt ": ")))
+			 url)))
+	"Copy")
+    (?M (lambda (info) (w3m-external-view (car info)))
+	"Open in external browser"))
+  "Alist specifying keycodes and available actions over a selected link."
+  :group 'w3m
+  :type w3m-lnum-actions-custom-type)
+
+(defcustom w3m-lnum-actions-button-alist
+  '("---- Button  ----"
+    (?p (lambda (info) (push-mark (point))
+	  (goto-char (cadr info))
+	  (widget-button-press (cadr info) (car info)))
+	"Goto button and push it")
+    (?P (lambda (info) (widget-button-press (cadr info) (car info)))
+	"Push"))
+  "Alist specifying keycodes and available actions over a selected button."
+  :group 'w3m
+  :type w3m-lnum-actions-custom-type)
+
+(defcustom w3m-lnum-actions-form-alist
+  '("----  Form   ----"
+    (?p (lambda (info) (setq mode-line-format original-mode-line-format)
+	  (w3m-lnum-remove-overlays)
+	  (push-mark (point))
+	  (goto-char (cadr info))
+	  (let ((w3m-form-new-session t)
+		(w3m-form-download nil))
+	    (eval action))) "Goto form and activate it")
+    (?P (lambda (info) (w3m-lnum-remove-overlays)
+	  (save-excursion
+	    (goto-char (cadr info))
+	    (let ((w3m-form-new-session nil)
+		  (w3m-form-download nil))
+	      (eval action)))) "Activate"))
+  "Alist specifying keycodes and available actions over a selected form field."
+  :group 'w3m
+  :type w3m-lnum-actions-custom-type)
+
+(defvar w3m-lnum-mode-map nil
+  "Keymap used when command `w3m-lnum-mode' is active.")
+(unless w3m-lnum-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "f" 'w3m-lnum-follow)
+    (define-key map "F" 'w3m-lnum-goto)
+    (define-key map "w" 'w3m-lnum-universal)
+    (w3m-substitute-key-definitions
+     map w3m-mode-map
+     'w3m-view-image 'w3m-lnum-view-image
+     'w3m-save-image 'w3m-lnum-save-image
+     'w3m-download-this-url 'w3m-lnum-download-this-url
+     'w3m-edit-this-url 'w3m-lnum-edit-this-url
+     'w3m-toggle-inline-image 'w3m-lnum-toggle-inline-image
+     'w3m-print-this-url 'w3m-lnum-print-this-url
+     'w3m-external-view-this-url 'w3m-lnum-external-view-this-url
+     'w3m-bookmark-add-this-url 'w3m-lnum-bookmark-add-this-url
+     'w3m-zoom-in-image 'w3m-lnum-zoom-in-image
+     'w3m-zoom-out-image 'w3m-lnum-zoom-out-image)
+    (setq w3m-lnum-mode-map map)))
 
-(defvar w3m-link-numbering-mode nil
+(defvar w3m-lnum-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-map-alist)
-  (push (cons 'w3m-link-numbering-mode w3m-link-numbering-mode-map)
+(make-variable-buffer-local 'w3m-lnum-mode)
+(unless (assq 'w3m-lnum-mode minor-mode-alist)
+  (push (list 'w3m-lnum-mode "[ln]") minor-mode-alist))
+(unless (assq 'w3m-lnum-mode minor-mode-map-alist)
+  (push (cons 'w3m-lnum-mode w3m-lnum-mode-map)
 	minor-mode-map-alist))
 
+(defun w3m-lnum-remove-overlays (&optional start end)
+  "Remove numbering and match overlays between START and END points.
+If missing, clear the current visible window."
+  (let ((start (or start (max (1- (window-start)) (point-min))))
+	(end (or end (min (window-end) (point-max)))))
+    (dolist (overlay (overlays-in start end))
+      (if (or (overlay-get overlay 'w3m-lnum-overlay)
+	      (overlay-get overlay 'w3m-lnum-match))
+	  (delete-overlay overlay)))))
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-status w3m-lnum-mode))
+    ;; find current numbering status of w3m buffers
+    (or (eq major-mode 'w3m-mode)
+	(save-current-buffer
+	  (setq w3m-lnum-status
+		(catch 'found-w3m
+		  (dolist (buf (buffer-list))
+		    (set-buffer buf)
+		    (if (eq major-mode 'w3m-mode)
+			(throw 'found-w3m
+			       w3m-lnum-mode)))))))
+    (setq arg (not (if arg (zerop arg)
+		     w3m-lnum-status)))
+    (unless (eq arg w3m-lnum-status)	; if change of mode status
+      (if arg
+	  (progn (add-hook 'w3m-mode-hook 'w3m-lnum-mode)
+		 (run-hooks 'w3m-lnum-mode-hook)
+		 (w3m-message "Link numbering keys on"))
+	(remove-hook 'w3m-mode-hook 'w3m-lnum-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-lnum-mode arg)))))))
+
+(defmacro w3m-lnum-set-overlay (pos index pmax)
+  "Set numbering overlay at POS with INDEX and until PMAX."
+  `(let ((overlay (make-overlay ,pos (1+ ,pos))))
+     (let ((num (format "[%d]" (setq ,index (1+ ,index)))))
+       (overlay-put overlay 'before-string num)
+       (w3m-static-if (featurep 'xemacs)
+	   (set-glyph-face (extent-begin-glyph overlay) 'w3m-lnum)
+	 (w3m-add-face-property 0 (length num) 'w3m-lnum num)
+	 (overlay-put overlay 'evaporate t)))
+     (overlay-put overlay 'w3m-lnum-overlay ,index)
+     (let ((hseq (get-char-property ,pos 'w3m-anchor-sequence))
+	   (pos2 ,pos))
+       (if hseq				; multiline anchors
+	   (while (and (setq pos2 (next-single-property-change
+				   pos2 'w3m-anchor-sequence))
+		       (setq pos2 (text-property-any
+				   pos2 ,pmax
+				   'w3m-anchor-sequence hseq)))
+	     (setq overlay (make-overlay pos2 (1+ pos2)))
+	     (overlay-put overlay 'w3m-lnum-overlay ,index))))))
+
+(defun w3m-lnum-set-numbering (&optional next-func reg dont-clear-p)
+  "Make overlays that display link numbers.  Return last used index.
+NEXT-FUNC is function to iterate numbered elements, if not given,
+use `w3m-goto-next-anchor-or-image'.  REG is filter string for anchor text.
+DONT-CLEAR-P determines whether previous numbering has to be cleared."
+  (setq reg
+	(if reg
+	    (w3m-replace-regexps-in-string ; escape special characters
+	     reg "\\?" "\\\\?" "\\!" "\\\\!" "\\[" "\\\\["
+	     "\\*" "\\\\*" "\\+" "\\\\+" "\\." "\\\\." "\\^" "\\\\^"
+	     "\\$" "\\\\$")
+	  "")
+	next-func (or next-func 'w3m-goto-next-anchor-or-image))
+  (let ((pos (max (1- (window-start)) (point-min)))
+	(pmax (min (window-end) (point-max))))
+    (unless dont-clear-p
+      (dolist (overlay (overlays-in pos pmax))
+	(if (overlay-get overlay 'w3m-lnum-overlay)
+	    (delete-overlay overlay))))
+    (let ((index 0)
+	  (context (or (assoc-default w3m-current-url
+				      w3m-lnum-context-alist
+				      'w3m-string-match-p)
+		       0)))
+      (while (and pos
+		  (setq pos (funcall next-func pos))
+		  (< pos pmax))
+	(let ((str ""))
+	  (let ((hseq (get-char-property pos 'w3m-anchor-sequence)))
+	    (if hseq			; multiline anchors
+		(let ((pos2 (next-single-property-change
+			     pos 'w3m-anchor-sequence)))
+		  (while (and pos2
+			      (setq pos2 (text-property-any
+					  pos2 pmax
+					  'w3m-anchor-sequence hseq)))
+		    (let ((pos3 pos2))
+		      (if (setq pos2 (next-single-property-change
+				      pos2 'w3m-anchor-sequence))
+			  (setq str
+				(concat str
+					(buffer-substring-no-properties
+					 pos3 pos2)))))))))
+	  (when (w3m-string-match-p reg
+				    (concat
+				     (buffer-substring-no-properties
+				      pos
+				      (next-single-property-change
+				       pos
+				       (cond ((w3m-anchor-sequence pos)
+					      'w3m-anchor-sequence)
+					     ((w3m-image pos)
+					      'w3m-image))))
+				     str))
+	    (w3m-lnum-set-overlay pos index pmax)
+	    (let ((counter context))
+	      (while (and (>= (setq counter (1- counter)) 0)
+			  (setq pos (funcall next-func pos))
+			  (< pos pmax))
+		(w3m-lnum-set-overlay pos index pmax))))))
+      index)))
+
+(defun w3m-lnum (arg &optional filter dont-clear-p)
+  "Make overlays that display link numbers.  Return last used index.
+With ARG 0 clear numbering overlay.  With ARG 1 index only links.
+With ARG 2 index only images.  Otherwise index all anchors.
+FILTER is filter string for anchor text.
+DONT-CLEAR-P determines whether previous numbering has to be cleared."
+  (if (zerop arg) (w3m-lnum-remove-overlays)
+    (w3m-lnum-set-numbering (cond ((= arg 1) 'w3m-goto-next-link)
+				  ((= arg 2) 'w3m-goto-next-image2)
+				  (t 'w3m-goto-next-anchor-or-image))
+			    filter dont-clear-p)))
+
+(defmacro w3m-lnum-prompt-str (num fun start def-anchor filter
+				   &optional show-num)
+  "Construct a prompt string for function `w3m-lnum-read-interactive'.
+NUM is a number variable for currently to be selected element.
+FUN is a function to be called with NUM as argument.
+START is a string to start the prompt.
+DEF-ANCHOR is info for the default 0 element.
+FILTER is current string used for filtering.
+SHOW-NUM if specified replaces NUM."
+  `(let ((anchor (funcall ,fun ,num))
+	 (show-num ,show-num))
+     (setq anchor (if anchor (concat " [" anchor "]")
+		    (setq ,num 0
+			  show-num "")
+		    ,def-anchor))
+     (concat ,start
+	     (or show-num (propertize
+			   (number-to-string ,num)
+			   'face 'w3m-lnum-minibuffer-prompt))
+	     " " ,filter anchor)))
+
+(defmacro w3m-read-event (prompt key)
+  "Read event with PROMPT and return keycode.
+KEY is what XEmacs gives for event-key."
+  (w3m-static-if (featurep 'xemacs)
+      `(progn
+	 (display-message 'no-log ,prompt)
+	 (let ((event (next-command-event)))
+	   (if (key-press-event-p event)
+	       (or (event-to-character event)
+		   (characterp
+		    (setq ,key (event-key event)))
+		   ,key))))
+    `(read-event ,prompt t)))
+
+(eval-when-compile
+  (if (fboundp 'redisplay) nil
+    (defalias 'redisplay 'ignore)))
+
+(defun w3m-lnum-read-interactive (prompt fun type last-index &optional
+					 def-anchor filter def-num)
+  "Interactively read a valid integer from minubuffer with PROMPT.
+Execute a one argument function FUN with every current valid integer.
+TYPE is type of link numbering.  DEF-ANCHOR is initial element to print.
+FILTER is the initial aplied filter.
+DEF-NUM is the initial selected element, 1 if not given.
+Use <return> to submit current selection; <backspace> for correction;
+<C-g> or <escape> to quit action;
+`<', `>', <space> and <delete> for scrolling page.
+Entering 0 may choose default anchor without <return>.
+Every other character is appended to a filtering string.
+<CTRL>+<DIGIT> is appended to the filtering string as <DIGIT>.
+If `w3m-lnum-quick-browse' is non-nil, choose without
+<return> on single possible selection.
+Return list of selected number and last applied filter."
+  (setq def-anchor (if def-anchor (concat " [" def-anchor "]")
+		     "")
+	prompt (propertize prompt 'face 'w3m-lnum-minibuffer-prompt))
+  (let ((filter (or filter ""))
+	(auto-num (or (null def-num) (= def-num 0)))
+	ch key)
+    (let ((num (if auto-num 1 def-num)))
+      (catch 'select
+	(let ((temp-prompt (w3m-lnum-prompt-str num fun prompt
+						def-anchor filter
+						(if auto-num ""))))
+	  (while (not (memq		; while not return or escape
+		       (setq ch (w3m-read-event temp-prompt key))
+		       '(return 10 13 ?\n ?\r ?\C-g escape 27 ?\e)))
+	    (cond
+	     ((memq ch '(backspace 8 127 ?\C-h))
+	      (if auto-num
+		  (unless (string-equal filter "") ; delete last filter character
+		    (setq num 1
+			  last-index
+			  (w3m-lnum
+			   type (setq filter
+				      (w3m-substring-no-properties
+				       filter 0
+				       (1- (length filter)))))
+			  temp-prompt
+			  (w3m-lnum-prompt-str num fun prompt
+					       def-anchor filter "")))
+		(setq num (/ num 10))	; delete last digit
+		(if (zerop num)
+		    (setq num 1
+			  auto-num t))
+		(setq temp-prompt
+		      (w3m-lnum-prompt-str num fun prompt
+					   def-anchor filter
+					   (if auto-num "")))))
+	     ;; scroll options
+	     ((memq ch '(32 ?\ ))		; scroll down
+	      (w3m-lnum-remove-overlays (point-min) (point-max))
+	      (ignore-errors
+		(w3m-scroll-up)
+		;; scroll-up sets wrongly window-start/end
+		(if (and (fboundp 'redisplay)
+			 (not (eq (symbol-function 'redisplay) 'ignore)))
+		    (redisplay)
+		  (sit-for 0)))
+	      #1=
+	      (setq last-index (w3m-lnum type filter t)
+		    num (if (zerop last-index) 0 1)
+		    auto-num t
+		    temp-prompt (w3m-lnum-prompt-str num fun prompt
+						     def-anchor
+						     filter "")))
+	     ((eq ch 'delete)		; scroll up
+	      (w3m-lnum-remove-overlays (point-min) (point-max))
+	      (ignore-errors (scroll-down nil))
+	      #1#)
+	     ((memq ch '(60 ?<)) (w3m-scroll-right nil))
+	     ((memq ch '(62 ?>)) (w3m-scroll-left nil))
+	     ;; iteration options
+	     ((memq ch '(left up))
+	      (setq num (if (> num 1) (1- num)
+			  last-index)
+		    auto-num t
+		    temp-prompt
+		    (w3m-lnum-prompt-str num fun prompt def-anchor
+					 filter "")))
+	     ((memq ch '(right down))
+	      (setq num (if (< num last-index)
+			    (1+ num)
+			  1)
+		    auto-num t
+		    temp-prompt
+		    (w3m-lnum-prompt-str num fun prompt def-anchor
+					 filter "")))
+	     ((and (w3m-static-if (featurep 'xemacs) ; digit
+		       (characterp ch)
+		     (numberp ch))
+		   (< 47 ch) (< ch 58))
+	      (if auto-num
+		  (if (= ch 48) (throw 'select (setq num 0))
+		    (setq num (- ch 48)
+			  auto-num nil))
+		(setq num (+ (* num 10) ch -48)))
+	      (if (> num last-index)
+		  (if (zerop (setq num (/ num 10)))
+		      (setq num 1
+			    auto-num t))
+		(and (memq w3m-lnum-quick-browsing
+			   '(quick-all quick-numbers))
+		     (> (* num 10) last-index)
+		     (throw 'select num)))
+	      (setq temp-prompt
+		    (w3m-lnum-prompt-str num fun prompt def-anchor
+					 filter (if auto-num ""))))
+	     (t (setq ch (string (w3m-static-if (featurep 'xemacs)
+				     (cond
+				      ((eq ch t) key)
+				      ((= ch ?\^@) ?\ ) ;<ctrl>+SPACE
+				      (t ch))
+				   (cond
+				    ((= ch 67108896) 32) ;<ctrl>+SPACE
+				    ((and (< 67108911 ch) ;treat <ctrl>+DIGIT
+					  (< ch 67108922))
+				     (- ch 67108864)) ; as DIGIT
+				    (t ch)))))
+		(setq last-index (w3m-lnum type
+					   (setq filter
+						 (concat filter ch))))
+		(if (and (= last-index 1)
+			 (memq w3m-lnum-quick-browsing
+			       '(quick-all quick-filter)))
+		    (throw 'select (setq num 1))
+		  (if (zerop last-index) ; filter left nothing, remove new char
+		      (setq last-index
+			    (w3m-lnum
+			     type
+			     (setq filter (w3m-substring-no-properties
+					   filter 0
+					   (1- (length filter))))
+			     t)))
+		  (setq num 1
+			auto-num t
+			temp-prompt
+			(w3m-lnum-prompt-str num fun prompt def-anchor
+					     filter "")))))))
+	(if (memq ch '(?\C-g escape 27 ?\e))
+	    (keyboard-quit)))
+      (list num filter))))
+
+(defmacro w3m-with-lnum (type filter &rest body)
+  "Within TYPE anchor numbering with FILTER execute BODY.
+Types are: 0 no numbering, 1 links, 2 images, otherwise all anchors.
+Then clear numbering overlays.  Within BODY, `last-index' is bound to
+the last used index number."
+  `(let ((original-mode-line-format mode-line-format))
+     (unwind-protect (progn
+		       (setq mode-line-format
+			     "RET: select | BACKSPACE: correction | \
+chars, C-digit, C-SPACE: add chars, digits or space to string \
+filter | arrows: move selection | SPACE,DEL,<,>: scroll | \
+ESC, C-g: quit")
+		       (w3m-force-mode-line-update)
+		       (let ((last-index (w3m-lnum ,type ,filter)))
+			 ,@body))
+       (setq mode-line-format original-mode-line-format)
+       (w3m-lnum-remove-overlays))))
+
+(defun w3m-lnum-highlight-anchor (arg)
+  "Highlight specified by ARG number anchor.
+Return selected anchor."
+  (let (marked-label)
+    (dolist (overlay (overlays-in (max (1- (window-start))
+				       (point-min))
+				  (min (window-end) (point-max))))
+      (cond
+       ((overlay-get overlay 'w3m-lnum-match)
+	(delete-overlay overlay))
+       ((eq arg (overlay-get overlay 'w3m-lnum-overlay))
+	(let* ((start (overlay-start overlay))
+	       (match-overlay
+		(make-overlay
+		 start
+		 (next-single-property-change
+		  start
+		  (cond ((w3m-anchor-sequence start)
+			 'w3m-anchor-sequence)
+			((w3m-image start) 'w3m-image)
+			(t 'w3m-action))))))
+	  (overlay-put match-overlay 'w3m-lnum-match t)
+	  (overlay-put match-overlay 'face 'w3m-lnum-match)
+	  (or marked-label
+	      (setq marked-label
+		    (or (w3m-anchor start)
+			(w3m-image start)
+			(buffer-substring-no-properties
+			 start (next-single-property-change
+				start 'w3m-action)))))))))
+    marked-label))
+
+(defmacro w3m-lnum-get-match-info (condition found-tag)
+  "For the first overlay matching CONDITION throw through FOUND-TAG \
+anchor info."
+  `(dolist (overlay (overlays-in (max (1- (window-start)) (point-min))
+				 (min (window-end) (point-max))))
+     (if ,condition
+	 (let* ((pos (overlay-start overlay))
+		(href (w3m-anchor pos)))
+	   (throw ,found-tag
+		  (if href (list href pos (w3m-image pos)
+				 (w3m-image-alt pos))
+		    (list (w3m-action pos) pos (w3m-image pos)
+			  (w3m-image-alt pos))))))))
+
+(defun w3m-lnum-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."
+  (catch 'found
+    (if num (w3m-lnum-get-match-info
+	     (eq num (overlay-get overlay 'w3m-lnum-overlay))
+	     'found)
+      (w3m-lnum-get-match-info (overlay-get overlay 'w3m-lnum-match)
+			       'found))))
+
+(defun w3m-lnum-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: 0 - no numbering,
+1 - only links, 2 - only images, otherwise - all anchors.
+Highlight every intermediate result anchor.
+Input 0 corresponds to location url."
+  (setq type (or type 3))
+  (w3m-with-lnum
+   type ""
+   (if (and (= type 2)			; image lack of selection
+	    (= last-index 1))
+       (if (y-or-n-p "Single image found. Select it?")
+	   (w3m-lnum-get-anchor-info 1))
+     (if (and (zerop last-index)
+	      (not (= type 2)))
+	 (if (y-or-n-p (concat "No items found. Select default? ["
+			       w3m-current-url "] "))
+	     (list w3m-current-url 16 nil nil)
+	   (keyboard-quit))
+       (let ((num (car (w3m-lnum-read-interactive
+			(or prompt "Anchor number: ")
+			'w3m-lnum-highlight-anchor
+			type last-index (unless (= type 2)
+					  w3m-current-url)))))
+	 (if (and (zerop num)
+		  (not (= type 2)))
+	     (list w3m-current-url 16 nil nil)
+	   (w3m-lnum-get-anchor-info num)))))))
+
+;;;###autoload
+(defun w3m-lnum-goto ()
+  "Turn on link, image and form numbers and ask for one to go to.
+0 corresponds to location url."
+  (interactive)
+  (let ((info (w3m-lnum-get-action)))
+    (if info (progn (push-mark (point))
+		    (goto-char (cadr info)))
+      (w3m-message "No valid anchor selected"))))
+
+(defmacro w3m-lnum-visit (info &optional new-session edit)
+  "Visit URL determined with selection INFO.
+If NEW-SESSION, visit in new buffer.
+If EDIT, edit URL before visiting."
+  (if new-session
+      `(w3m-goto-url-new-session
+	,(if edit `(read-string "Visit url in new session: "
+				(car ,info))
+	   `(car ,info)))
+    `(progn (push-mark (point))
+	    (goto-char (cadr ,info))
+	    (w3m-history-store-position)
+	    (w3m-goto-url
+	     ,(if edit `(read-string "Visit url: "
+				     (car ,info))
+		`(car ,info))))))
+
+;;;###autoload
+(defun w3m-lnum-follow (arg)
+  "Turn on link numbers, ask for one and execute appropriate action on it.
+If link - visit it, when button - press, when input - activate it,
+If image - toggle it.
+With prefix ARG visit link in new session or don't move over
+field/button/image on activation/push/toggle.
+With `-' ARG, for link image - go to it and toggle it.
+With -4 ARG, for link image - toggle it.
+With double prefix ARG, prompt for url to visit.
+With triple prefix ARG, prompt for url to visit in new session."
+  (interactive "p")
+  (let ((info (w3m-lnum-get-action
+	       (concat "Follow " (if (> arg 1) "in new session ")
+		       "(select anchor): "))))
+    (if info
+	(let ((action (car info)))
+	  (cond ((null action)		; image
+		 (if (> arg 1) (save-excursion
+				 (goto-char (cadr info))
+				 (w3m-toggle-inline-image))
+		   (goto-char (cadr info))
+		   (w3m-toggle-inline-image)))
+		((stringp action)	; url
+		 (cond ((or (= arg 1) (and (= arg -1) ; visit
+					   (not (nth 2 info))))
+			(w3m-lnum-visit info))
+		       ((= arg -1)	; goto image and toggle it
+			(goto-char (cadr info))
+			(w3m-toggle-inline-image))
+		       ((or (= arg 4) (and (= arg -4) ; new session
+					   (not (nth 2 info))))
+			(w3m-lnum-visit info t))
+		       ((= arg -4) (save-excursion ; toggle image
+				     (goto-char (cadr info))
+				     (w3m-toggle-inline-image)))
+		       ((= arg 16)	; prompt for url
+			(w3m-lnum-visit info nil t))
+		       ((= arg 64)    ; prompt for url for new session
+			(w3m-lnum-visit info t t))))
+		((eq (car action) 'w3m-form-submit) ; button
+		 (when (= arg 1)
+		   (push-mark (point))
+		   (goto-char (cadr info)))
+		 (widget-button-press (cadr info) action))
+		(t (if (> arg 1) (save-excursion ; form field
+				   (goto-char (cadr info))
+				   (let ((w3m-form-new-session nil)
+					 (w3m-form-download nil))
+				     (eval action)))
+		     (push-mark (point))
+		     (goto-char (cadr info))
+		     (let ((w3m-form-new-session t)
+			   (w3m-form-download nil))
+		       (eval action))))))
+      (w3m-message "No valid anchor selected"))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; universal
+
+(defmacro w3m-lnum-make-action (text cmd)
+  "Return a TEXT propertized as a link that invokes CMD when clicked."
+  `(propertize ,text 'action ,cmd 'mouse-face 'highlight))
+
+(defun w3m-lnum-universal-dispatch (info label action-alist)
+  "Print available options for determined by INFO element.
+LABEL is identifier to be echoed in the minibuffer.
+ACTION-ALIST is an alist of available options where each element
+is in the following format: (keycode function docstring).
+Function has to take one argument that is selection info."
+  (let ((action-alist (append action-alist w3m-lnum-actions-general))
+	char key default-option selection-made)
+    (save-window-excursion
+      (let ((original-mode-line-format mode-line-format))
+	(unwind-protect
+	    (let ((selection-buffer (get-buffer-create
+				     "*Emacs-w3m action selection*")))
+	      (set-buffer selection-buffer)
+	      (setq mode-line-format "RET, left click: select | \
+<down>,TAB/<up>,BACKTAB: move to next/previous action"
+		    buffer-read-only nil)
+	      (w3m-force-mode-line-update)
+	      (mapc (lambda (option)
+		      (if (consp option)
+			  (insert
+			   (w3m-lnum-make-action
+			    (concat "[    " (char-to-string
+					     (car option)) "    ] "
+					     (nth 2 option))
+			    (cadr option))
+			   "\n")
+			(insert option "\n")))
+		    action-alist)
+	      (insert (w3m-lnum-make-action
+		       "[Backspace] Back to selection"
+		       (lambda (info) 'restart-selection))
+		      "\n")
+	      (insert (w3m-lnum-make-action "[   ESC   ] Quit"
+					    (lambda (info) nil)))
+	      (setq buffer-read-only t)
+	      (goto-char (point-min))
+	      (while (not (get-text-property (point) 'action))
+		(forward-line))		; go over first action
+	      (pop-to-buffer selection-buffer)
+	      (setq char (w3m-read-event
+			  (concat
+			   (propertize
+			    "Select action: " 'face
+			    'w3m-lnum-minibuffer-prompt)
+			   "[" label "]")
+			  key))
+	      (while (and (not selection-made)
+			  (or (consp char)
+			      (memq char '(up down tab backtab
+					      return 10 13 ?\n ?\r))))
+		(if (consp char)		; mouse click?!
+		    (progn (mouse-set-point char)	; move to mouse point
+			   (let ((action (get-text-property (point)
+							    'action)))
+			     (if action (setq selection-made action))))
+		  (cond ((memq char '(up backtab)) ; move to previous action
+			 (when (/= (forward-line -1) 0)
+			   (goto-char (point-max)) ; ...or start from bottom
+			   (beginning-of-line))
+			 (while (and (not (get-text-property (point) 'action))
+				     (= (forward-line -1) 0))))
+			((memq char '(down tab)) ; move to next action
+			 (forward-line)
+			 (if (= (point) (point-max))
+			     (goto-char (point-min))) ; or move to top
+			 (while (and (not (get-text-property (point) 'action))
+				     (/= (point) (point-max)))
+			   (forward-line)))
+			((memq char '(return 10 13 ?\n ?\r)) ; <return> select
+			 (let ((action (get-text-property (point)
+							  'action)))
+			   (if action (setq selection-made action))))))
+		(unless selection-made
+		  (setq char (w3m-read-event
+			      (concat (propertize
+				       "Select action: " 'face
+				       'w3m-lnum-minibuffer-prompt)
+				      "[" label "]")
+			      key)))))
+	  (setq mode-line-format original-mode-line-format)
+	  (kill-buffer (current-buffer)))))
+    (unless (memq char '(?\C-g escape 27 ?\e))
+      (cond (selection-made (funcall selection-made info))
+	    ((memq char '(backspace 8 ?\C-h)) ; require new selection
+	     'restart-selection)
+	    (t (let ((dispatch (assoc-default char action-alist 'eq)))
+		 (if dispatch (funcall (car dispatch) info)
+		   (w3m-message "Invalid selection"))))))))
+
+;;;###autoload
+(defun w3m-lnum-universal ()
+  "Turn on link numbers, ask for one and offer actions over it \
+depending on selection type.
+Actions may be selected either by hitting corresponding key,
+pressing <return> over the action line or left clicking."
+  (interactive)
+  (let ((filter "")
+	(label w3m-current-url)
+	num)
+    (while
+	(eq 'restart-selection
+	    (w3m-with-lnum
+	     3 filter
+	     (let ((info
+		    (if (zerop last-index)
+			(list w3m-current-url 16 nil nil)
+		      (let ((selection (w3m-lnum-read-interactive
+					"Anchor number: "
+					'w3m-lnum-highlight-anchor
+					3 last-index w3m-current-url
+					filter
+					(if (eq num 1) nil num))))
+			(setq num (car selection)
+			      filter (cadr selection))
+			(if (zerop num)
+			    (progn (setq label w3m-current-url)
+				   (list w3m-current-url 16 nil nil))
+			  (setq label (w3m-lnum-highlight-anchor num))
+			  (w3m-lnum-get-anchor-info num))))))
+	       (if info
+		   (let ((action (car info)))
+		     (cond ((null action) ; image
+			    (w3m-lnum-universal-dispatch
+			     info label
+			     w3m-lnum-actions-image-alist))
+			   ((stringp action)		   ; url
+			    (if (or (stringp (nth 2 info)) ; image url
+				    (stringp (nth 3 info)))
+				(w3m-lnum-universal-dispatch
+				 info label
+				 (append w3m-lnum-actions-link-alist
+					 w3m-lnum-actions-image-alist))
+			      (w3m-lnum-universal-dispatch
+			       info label
+			       w3m-lnum-actions-link-alist)))
+			   ((eq (car action) 'w3m-form-submit) ; button
+			    (w3m-lnum-universal-dispatch
+			     info label
+			     w3m-lnum-actions-button-alist))
+			   (t (w3m-lnum-universal-dispatch ; form field
+			       info label
+			       w3m-lnum-actions-form-alist))))
+		 (w3m-message "No valid anchor selected"))))))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; lnum alternatives to w3m user commands on point
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-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-lnum-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-lnum-get-action
+		     "Open image url in external viewer: " 2))
+	   (w3m-external-view (nth 2 im)))
+	  (t (w3m-message "No image selected")))))
+
 ;;;###autoload
-(defun w3m-link-numbering-mode (&optional arg)
-  "Minor mode to enable operations using link numbers."
+(defun w3m-lnum-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-lnum-get-action "Save image: " 2))
+	   (w3m-download (nth 2 im)))
+	  (t (w3m-message "No image selected")))))
+
+(defmacro w3m-lnum-zoom-image (rate &optional in)
+  "Zoom image under point and interactively resize after that.
+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, then interactively resize.
+If 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)))
+       (if im
+	   (progn
+	     (let ((percent (,(if in '+ '-) 100
+			     (or ,rate w3m-resize-image-scale))))
+	       (w3m-resize-inline-image-internal im percent)
+	       (w3m-resize-image-interactive im ,rate
+					     (/ percent 100.0))))
+	 (setq im (w3m-lnum-get-action
+		   ,(concat "Zoom " (if in "in" "out") " image: ") 2))
+	 (save-excursion
+	   (goto-char (cadr im))
+	   (let ((percent (,(if in '+ '-) 100
+			   (or ,rate w3m-resize-image-scale))))
+	     (w3m-resize-inline-image-internal
+	      (car im) percent)
+	     (w3m-resize-image-interactive (car im) ,rate
+					   (/ percent 100.0))))))))
+
+(defun w3m-lnum-zoom-in-image (&optional rate)
+  "Zoom in an image under point and interactively resize after that.
+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, then
+interactively resize."
   (interactive "P")
-  (add-hook 'w3m-display-functions 'w3m-link-numbering)
-  (if (setq w3m-link-numbering-mode
-	    (if arg
-		(> (prefix-numeric-value arg) 0)
-	      (not w3m-link-numbering-mode)))
-      (progn
-	(w3m-link-numbering)
-	(run-hooks 'w3m-link-numbering-mode-hook))
-    (dolist (overlay (overlays-in (point-min) (point-max)))
-      (when (overlay-get overlay 'w3m-link-numbering-overlay)
-	(delete-overlay overlay)))))
-
-(defun w3m-link-numbering (&rest args)
-  "Make overlays that display link numbers."
-  (when w3m-link-numbering-mode
-    (save-excursion
-      (goto-char (point-min))
-      (let ((i 0)
-	    overlay num)
-	(catch 'already-numbered
-	  (while (w3m-goto-next-anchor)
-	    (when (w3m-anchor)
-	      (when (get-char-property (point) 'w3m-link-numbering-overlay)
-		(throw 'already-numbered nil))
-	      (setq overlay (make-overlay (point) (1+ (point)))
-		    num (format "[%d]" (incf i)))
-	      (w3m-static-if (featurep 'xemacs)
-		  (progn
-		    (overlay-put overlay 'before-string num)
-		    (set-glyph-face (extent-begin-glyph overlay)
-				    'w3m-link-numbering-face))
-		(when (featurep 'w3m-e20)
-		  (overlay-put overlay
-			       'face (get-text-property (point) 'face)))
-		(put-text-property 0 (length num)
-				   'face 'w3m-link-numbering-face
-				   num)
-		(overlay-put overlay 'before-string num)
-		(overlay-put overlay 'evaporate t))
-	      (overlay-put overlay 'w3m-link-numbering-overlay i))))))))
-
-(defun w3m-move-numbered-anchor (&optional arg)
-  "Move the point to the specified anchor.
-When no prefix argument is specified, call `w3m-view-this-url' instead
-of moving cursor."
+  (w3m-lnum-zoom-image rate t))
+
+(defun w3m-lnum-zoom-out-image (&optional rate)
+  "Zoom out an image on unter point and interactively resize after that.
+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, then
+interactively resize."
   (interactive "P")
-  (if (and arg
-	   (> (setq arg (prefix-numeric-value arg)) 0))
-      (catch 'found
-	(dolist (overlay (overlays-in (point-min) (point-max)))
-	  (when (eq arg (overlay-get overlay 'w3m-link-numbering-overlay))
-	    (goto-char (overlay-start overlay))
-	    (push (w3m-anchor-sequence) w3m-goto-anchor-hist)
-	    (w3m-horizontal-on-screen)
-	    (throw 'found (w3m-print-this-url))))
-	(error "Cannot found your specified link: %d" arg))
-    (w3m-view-this-url)))
+  (w3m-lnum-zoom-image rate))
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-get-action
+				  "Open in external browser: " 1))))))
+    (if url (w3m-external-view url)
+      (w3m-message "No URL selected"))))
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-get-action
+		       "Select link to edit: " 1)))))
+    (if url (w3m-edit-url url)
+      (w3m-message "No URL selected"))))
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-get-action "Select URL to copy: " 1)))
+      (if link
+	  (let ((url (car link)))
+	    (kill-new url)
+	    (w3m-message "%s%s" (let ((im-alt (nth 3 link)))
+				  (if (zerop (length im-alt)) ""
+				    (concat im-alt ": ")))
+			 url))
+	(w3m-message "No URL selected")))))
+
+;;;###autoload
+(defun w3m-lnum-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-lnum-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-lnum-bookmark-add-this-url ()
+  "Add link under cursor to bookmarks.
+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)))
+	  (w3m-message "Added"))
+     ((setq url (w3m-lnum-get-action "Select URL to bookmark: " 1))
+      (w3m-bookmark-add
+       (car url)
+       (let ((pos (cadr url)))
+	 (if (= pos 16)		; 0th anchor selected
+	     w3m-current-title
+	   (buffer-substring-no-properties
+	    (previous-single-property-change (1+ pos)
+					     'w3m-href-anchor)
+	    (next-single-property-change pos 'w3m-href-anchor)))))
+      (w3m-message "added"))
+     (t (w3m-message "No url selected")))))
+
+
+;;; add link action for generic browser
+(if browse-url-generic-program
+    (setq w3m-lnum-actions-link-alist
+	  (append w3m-lnum-actions-link-alist
+		  `((?m (lambda (info) (browse-url-generic (car info)))
+			,(concat "Open with "
+				 browse-url-generic-program))))))
+
+;;; add link action for curl if present
+(if (executable-find "curl")
+    (setq w3m-lnum-actions-link-alist
+	  (append w3m-lnum-actions-link-alist
+		  '((?D (lambda (info)
+			  (let ((olddir default-directory))
+			    (cd (read-directory-name
+				 "Save to: " (getenv "HOME")
+				 nil t))
+			    (shell-command
+			     (concat "curl -k -O '" (car info) "' &")
+			     "*Curl*")
+			    (cd olddir)))
+			"Download with Curl")))))
+
 
 (provide 'w3m-lnum)
 
Only in work/emacs-w3m-1.4.4/: w3m-load.el
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: w3m-mail.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-namazu.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-namazu.el
--- work/emacs-w3m-1.4.4/w3m-namazu.el	2005-02-15 20:04:44.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-namazu.el	2009-05-21 08:13:29.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-namazu.el --- The add-on program to search files with Namazu.
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -87,11 +87,11 @@
   :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))))
+  '`(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)
@@ -110,7 +110,7 @@
 		  :format "%v%i\n" :indent 8
 		  (directory :format "Index directory: %v\n" :size 0)))))
   :set (lambda (symbol value)
-	 (set-default symbol value)
+	 (custom-set-default symbol value)
 	 (put 'w3m-namazu-default-index 'custom-type
 	      (eval w3m-namazu-default-index-customize-spec))))
 
@@ -145,7 +145,7 @@
   :type '(coding-system :size 0))
 
 
-(defsubst w3m-namazu-call-process (index query whence)
+(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)))
@@ -168,10 +168,10 @@
   (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)
+	(when (string-match "\\`\\(?:index\\|\\(query\\)\\|\\(whence\\)\\)=" s)
 	  (set (cond
-		((match-beginning 2) 'query)
-		((match-beginning 3) 'whence)
+		((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)
@@ -205,7 +205,7 @@
 	    (forward-char -1)
 	    (insert "file://"))
 	  (goto-char (point-min))
-	  (while (re-search-forward "<a href=\"\\(\\?\\)&\\(amp;\\)?whence="
+	  (while (re-search-forward "<a href=\"\\(\\?\\)&\\(?:amp;\\)?whence="
 				    nil t)
 	    (goto-char (match-beginning 1))
 	    (delete-char 1)
@@ -274,4 +274,5 @@
 		reload))
 
 (provide 'w3m-namazu)
+
 ;;; w3m-namazu.el ends here
Only in work/emacs-w3m-1.4.4/: w3m-om.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-perldoc.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-perldoc.el
--- work/emacs-w3m-1.4.4/w3m-perldoc.el	2004-10-08 20:55:26.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-perldoc.el	2007-10-17 20:15:57.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-perldoc.el --- The add-on program to view Perl documents.
 
-;; Copyright (C) 2001, 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: w3m, perldoc
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -57,7 +58,7 @@
 	 (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
 				      (default-value symbol)))))
   :set (lambda (symbol value)
-	 (set-default
+	 (custom-set-default
 	  symbol
 	  (delq nil (delete "" (mapcar (lambda (x) (if (stringp x) x))
 				       value))))))
@@ -93,8 +94,6 @@
 				  nil t nil "-u" docname)))
 	   (let ((coding-system-for-write w3m-perldoc-input-coding-system)
 		 (coding-system-for-read w3m-perldoc-input-coding-system))
-	     (w3m-static-if (featurep 'xemacs)
-		 (goto-char (point-max)))
 	     (zerop (apply (function call-process-region)
 			   (point-min) (point-max)
 			   w3m-perldoc-pod2html-command
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-proc.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-proc.el
--- work/emacs-w3m-1.4.4/w3m-proc.el	2005-02-15 20:04:44.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-proc.el	2012-07-18 15:04:53.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-proc.el --- Functions and macros to control sub-processes
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2005, 2007-2010, 2012
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
@@ -26,9 +26,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -41,24 +41,8 @@
 (eval-when-compile
   (require 'cl))
 
-;; Silence the byte compiler complaining against `gensym'.
-(eval-when-compile
-  (defvar byte-compile-cl-functions nil)
-  (when (consp byte-compile-cl-functions)
-    (setq byte-compile-cl-functions
-	  (delq 'gensym byte-compile-cl-functions))))
-
 (require 'w3m-util)
 
-(eval-and-compile
-  (cond ((boundp 'MULE)
-	 (autoload 'read-passwd "w3m-om"))
-	((= emacs-major-version 19)
-	 (autoload 'read-passwd "w3m-19"))
-	((boundp 'header-line-format)
-	 (autoload 'w3m-force-window-update
-	   (format "w3m-e%d" emacs-major-version)))))
-
 (eval-when-compile
   ;; Variable(s) which are used in the following inline functions.
   ;; They should be defined in the other module at run-time.
@@ -73,7 +57,13 @@
   (defvar w3m-async-exec)
   (defvar w3m-process-connection-type)
   (defvar w3m-process-modeline-format)
-  (defvar w3m-work-buffer-list))
+  (defvar w3m-work-buffer-list)
+  (autoload 'w3m-idle-images-show-unqueue "w3m"))
+
+;; Silence the Emacs's 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.")
@@ -104,7 +94,8 @@
 
 (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."
@@ -145,7 +136,7 @@
 (put 'w3m-process-with-environment 'lisp-indent-function 1)
 (put 'w3m-process-with-environment 'edebug-form-spec '(form body))
 
-(defsubst w3m-process-p (object)
+(defun w3m-process-p (object)
   "Return t if OBJECT is a `w3m-process' object."
   (and (consp object)
        (vectorp (cdr object))
@@ -196,7 +187,7 @@
     (with-current-buffer (w3m-process-buffer x)
       (setq w3m-process-object x))))
 
-(defsubst w3m-process-kill-process (process)
+(defun w3m-process-kill-process (process)
   "Kill process PROCESS safely."
   (when (processp process)
     (set-process-filter process 'ignore)
@@ -242,14 +233,7 @@
 (defun w3m-process-kill-stray-processes ()
   "Kill stray processes."
   (dolist (obj w3m-process-queue)
-    (if (buffer-name (w3m-process-buffer obj))
-	(save-excursion
-	  (set-buffer (w3m-process-buffer obj))
-	  (dolist (x (w3m-process-handlers w3m-process-object))
-	    (unless (buffer-name (w3m-process-handler-parent-buffer x))
-	      (setq w3m-process-queue (delq obj w3m-process-queue))
-	      (when (w3m-process-process obj)
-		(w3m-process-kill-process (w3m-process-process obj))))))
+    (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))))))
@@ -314,15 +298,7 @@
     (with-current-buffer buffer
       (setq w3m-current-process nil)))
   (w3m-process-start-queued-processes)
-  (w3m-static-when (boundp 'header-line-format)
-    ;; Redisplay the header-line.
-    (run-at-time 0.5 nil
-		 (lambda (buffer)
-		   (if (and (buffer-live-p buffer)
-			    (eq (get-buffer-window buffer t)
-				(selected-window)))
-		       (w3m-force-window-update)))
-		 buffer)))
+  (w3m-force-window-update-later buffer))
 
 (defun w3m-process-shutdown ()
   (let ((list w3m-process-queue))
@@ -351,7 +327,7 @@
 (put 'w3m-process-timeout 'error-conditions '(error w3m-process-timeout))
 (put 'w3m-process-timeout 'error-message "Time out")
 
-(defsubst w3m-process-error-handler (error-data process)
+(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)))
@@ -367,7 +343,7 @@
     (let ((start (current-time)))
       (while (or (and (prog2
 			  (discard-input)
-			  (not (sit-for 1))
+			  (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
@@ -491,17 +467,18 @@
 		    (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))
+       (w3m-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))))
+			    (cons #',post-body
+				  (cons #',post-handler handler))))
 		       (with-current-buffer ,temp-buffer ,@form))))
 	   (if (w3m-process-p ,var)
 	       (if handler
@@ -509,7 +486,7 @@
 		 (w3m-process-start-process ,var))
 	     (if (w3m-process-p
 		  (setq ,var (save-current-buffer
-			       (let ((handler (cons ',post-handler handler)))
+			       (let ((handler (cons #',post-handler handler)))
 				 (,post-body ,var)))))
 		 (if handler
 		     ,var
@@ -545,13 +522,19 @@
 	  (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))
+  (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))
@@ -562,12 +545,16 @@
 		    (obj    w3m-process-object))
 		(setq w3m-process-object nil)
 		(dolist (x (w3m-process-handlers obj))
-		  (when (buffer-name (w3m-process-handler-buffer x))
+		  (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 buffer))))
+		      (insert-buffer-substring buffer))))
 		(dolist (x (w3m-process-handlers obj))
-		  (when (buffer-name (w3m-process-handler-buffer x))
+		  (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
@@ -597,7 +584,7 @@
 (defun w3m-process-filter (process string)
   (when (buffer-name (process-buffer process))
     (with-current-buffer (process-buffer process)
-      (let ((buffer-read-only nil)
+      (let ((inhibit-read-only t)
 	    (case-fold-search nil))
 	(goto-char (process-mark process))
 	(insert string)
@@ -605,16 +592,20 @@
 	(unless (string= "" string)
 	  (goto-char (point-min))
 	  (cond
-	   ((and (looking-at "\\(Accept [^\n]+\n\\)*\\([^\n]+: accept\\? \\)(y/n)")
+	   ((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 2))))
+	    (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?Wrong username or password\n\\)?Proxy Username for \\(.*\\): Proxy Password: ")
+	   ((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)))
@@ -624,8 +615,8 @@
 	      (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 \\(.*\\): ")
+	   ((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)))
@@ -636,8 +627,8 @@
 	    (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: ")
+	   ((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)))
@@ -650,10 +641,11 @@
 	      (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?: ")
+	   ((and (looking-at "\\(\n?Wrong username or password\n\\)?\
+Username for \\(.*\\)\n?: ")
 		 (= (match-end 0) (point-max)))
-	    (setq w3m-process-realm (match-string 2))
+	    (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
@@ -663,13 +655,22 @@
 	    (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\\)$"
+	       "^W3m-\\(?:in-\\)?progress: \\([.0-9]+/[.0-9]+[a-zA-Z]?b\\)$"
 	       nil t))
-	    (let ((str (w3m-process-modeline-format (match-string 2)))
+	    (let ((str (w3m-process-modeline-format (match-string 1)))
 		  (buf))
 	      (save-current-buffer
 		(dolist (handler (w3m-process-handlers w3m-process-object))
@@ -760,23 +761,41 @@
 NOTE: This function is designed to avoid annoying questions.  So when
 the same questions is reasked, its previous answer is reused without
 prompt."
-  (let (elem answer (root (w3m-get-server-hostname url)))
-    (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))
+  (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)
 
Only in work/emacs-w3m-1.4.4/: w3m-proc.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-rss.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-rss.el
--- work/emacs-w3m-1.4.4/w3m-rss.el	2005-03-18 21:51:56.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-rss.el	2012-07-18 15:04:54.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-rss.el --- RSS functions
 
-;; Copyright (C) 2004, 2005 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2004, 2005, 2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -18,9 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -40,6 +40,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(require 'w3m-util)
 (autoload 'xml-parse-region "xml")
 
 (eval-and-compile
@@ -105,27 +106,27 @@
 	      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\\)?"
+\\([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)))
+	 (w3m-labels ((substr (n default)
+			      (if (match-beginning n)
+				  (string-to-number
+				   (match-string-no-properties n date))
+				default)))
 	   (encode-time
-	    (substr 10 0) ;; seconds
-	    (substr 8  0) ;; minitue
-	    (substr 7  0) ;; hour
-	    (substr 5  1) ;; day
-	    (substr 3  1) ;; month
-	    (substr 1  0) ;; year
-	    (if (match-beginning 12)
-		(funcall (intern (match-string-no-properties 12 date))
+	    (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 13 0))
-			 (* 60 (substr 14 0)))
+			 (* 3600 (substr 8 0))
+			 (* 60 (substr 9 0)))
 	      0))))))
 
 (defun w3m-rss-find-el (tag data)
Only in work/emacs-w3m-1.4.4/: w3m-rss.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-search.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-search.el
--- work/emacs-w3m-1.4.4/w3m-search.el	2004-10-03 18:59:48.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-search.el	2012-12-25 10:47:58.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; w3m-search.el --- functions convenient to access web search engines
 
-;; Copyright (C) 2001, 2002, 2003, 2004
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001--2012 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Keisuke Nishida    <kxn30@po.cwru.edu>,
 ;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
@@ -22,9 +21,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -41,7 +40,12 @@
 (require 'w3m)
 
 (defcustom w3m-search-engine-alist
-  (let ((ja (equal "Japanese" w3m-language)))
+  (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"
@@ -53,93 +57,177 @@
 	    ("yahoo-ja"
 	     "http://search.yahoo.co.jp/bin/search?p=%s"
 	     euc-japan)))
-	,@(if ja
-	      '(("google"
-		 "http://www.google.com/search?q=%s&hl=ja&lr=lang_ja&ie=Shift_JIS"
-		 shift_jis)
-		("google-en"
-		 "http://www.google.com/search?q=%s"))
-	    '(("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"
-	       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"))
+      ("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?q=%s&hl=ja&ie=utf-8&oe=utf-8"
+	     utf-8)
+	    ("google news-en"
+	     "http://news.google.com/news?q=%s&hl=en")))
+	 (ja
+	  '(("google news"
+	     "http://news.google.co.jp/news?q=%s&hl=ja&ie=Shift_JIS&oe=Shift_JIS"
+	     shift_jis)
+	    ("google news-en"
+	     "http://news.google.com/news?q=%s&hl=en")))
+	 (utf-8
+	  '(("google news"
+	     "http://news.google.com/news?q=%s&ie=utf-8&oe=utf-8"
+	     utf-8)
+	    ("google news-en"
+	     "http://news.google.com/news?q=%s&hl=en&ie=utf-8&oe=utf-8")))
+	 (t
+	  '(("google news"
+	     "http://news.google.com/news?q=%s")
+	    ("google news-ja"
+	     "http://news.google.co.jp/news?q=%s&hl=ja&ie=Shift_JIS&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=en&q=%s")
-	      ("All the Web-ja"
-	       "http://www.alltheweb.com/search?web&_sb_lang=ja&cs=euc-jp&q=%s"
-	       euc-japan)))
-	("goo-ja"
-	 "http://www.goo.ne.jp/default.asp?MT=%s"
-	 euc-japan)
-	("excite-ja"
-	 "http://www.excite.co.jp/search.gw?target=combined&look=excite_jp\
+	       "http://www.alltheweb.com/search?q=%s&web&_sb_lang=ja&cs=euc-jp"
+	       euc-japan)
+	      ("All the Web-en"
+	       "http://www.alltheweb.com/search?q=%s&web&_sb_lang=en"))
+	  '(("All the Web"
+	     "http://www.alltheweb.com/search?q=%s&web&_sb_lang=en")
+	    ("All the Web-ja"
+	     "http://www.alltheweb.com/search?q=%s&web&_sb_lang=ja&cs=euc-jp"
+	     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)
-	("lycos-ja"
-	 "http://www.lycos.co.jp/cgi-bin/pursuit?query=\"%s\"&cat=jp&\
-encoding=shift-jis"
-	 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\
+       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\
+      ("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\
+       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/cgi-bin/dict_search.cgi?MT=%s&sw=1"
-	 euc-japan)
-	("eiwa"
-	 "http://dictionary.goo.ne.jp/cgi-bin/dict_search.cgi?MT=%s&sw=0")
-	("kokugo"
-	 "http://dictionary.goo.ne.jp/cgi-bin/dict_search.cgi?MT=%s&sw=2"
-	 euc-japan)
-	("eiei"
-	 "http://www.dictionary.com/cgi-bin/dict.pl?term=%s&r=67")
-	,@(if ja
-		'(("amazon"
-		   "http://www.amazon.co.jp/exec/obidos/search-handle-form/\
-250-7496892-7797857"
-		   shift_jis
-		   "url=index=blended&search-type=quick-search&\
-field-keywords=%s")
-		  ("amazon-en"
-		   "http://www.amazon.com/exec/obidos/search-handle-form/\
+      ("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"
-		   nil
-		   "url=index=blended&field-keywords=%s"))
-	      '(("amazon"
-		 "http://www.amazon.com/exec/obidos/search-handle-form/\
+	       iso-8859-1
+	       "url=index=blended&field-keywords=%s"))
+	  '(("amazon"
+	     "http://www.amazon.com/exec/obidos/search-handle-form/\
 250-7496892-7797857"
-		 nil
-		 "url=index=blended&field-keywords=%s")
-		("amazon-ja"
-		 "http://www.amazon.co.jp/exec/obidos/search-handle-form/\
-250-7496892-7797857"
-		 shift_jis
-		 "url=index=blended&search-type=quick-search&\
-field-keywords=%s")))))
+	     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.
@@ -155,9 +243,7 @@
 		 (string :format "       Action: %v\n" :size 0)
 		 (coding-system :format "%t: %v\n" :size 0)
 		 (checklist :inline t
-			    :entry-format ,(if (if (featurep 'xemacs)
-						   (device-on-window-system-p)
-						 window-system)
+			    :entry-format ,(if (w3m-device-on-window-system-p)
 					       "%b   %v"
 					     "%b  %v")
 			    (string :format "PostData: %v\n" :size 0)))))
@@ -175,12 +261,16 @@
   :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)
-   "+"))
+  (mapconcat (lambda (s) (w3m-url-encode-string s coding))
+	     (split-string str)
+	     "+"))
 
 (defun w3m-search-read-query (prompt prompt-with-default &optional history)
   "Read a query from the minibuffer, prompting with string PROMPT.
@@ -189,10 +279,12 @@
   (let ((default
 	  (if (w3m-region-active-p)
 	      (buffer-substring (region-beginning) (region-end))
-	    (unless (eq (get-text-property (line-beginning-position) 'face)
-			'w3m-header-line-location-title-face)
-	      (thing-at-point 'word))))
-	(initial))
+	    (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))
@@ -205,42 +297,63 @@
 		   prompt)
 		 initial history default)))
 
-;;;###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
-   (let ((engine
+(defun w3m-search-read-variables ()
+  "Ask for a search engine and words to query and return them as a list."
+  (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)")))
+  (let* ((search-engine
 	  (if current-prefix-arg
-	      (let ((completion-ignore-case t))
+	      (let ((default (or (car w3m-search-engine-history)
+				 w3m-search-default-engine))
+		    (completion-ignore-case t))
 		(completing-read (format "Which engine? (default %s): "
-					 w3m-search-default-engine)
-				 w3m-search-engine-alist nil t))
-	    w3m-search-default-engine)))
-     (when (string= engine "")
-       (setq engine w3m-search-default-engine))
-     (list engine
-	   (w3m-search-read-query
-	    (format "%s search: " engine)
-	    (format "%s search (default %%s): " engine)))))
+					 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)))
-	    (w3m-goto-url
-	     (format (cadr info) query-string)
-	     post-data
-	     nil
-	     (and post-data (format post-data query-string))))
+	    (w3m-history-store-position)
+	    (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)))
Only in /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/: w3m-session.el
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-symbol.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-symbol.el
--- work/emacs-w3m-1.4.4/w3m-symbol.el	2005-03-22 17:03:48.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-symbol.el	2009-01-09 17:32:27.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-symbol.el --- Stuffs to replace symbols for emacs-w3m -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005 ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
+;; 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
@@ -17,8 +18,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -31,7 +32,9 @@
 
 (eval-when-compile
   (defvar w3m-output-coding-system)
-  (defvar w3m-language))
+  (defvar w3m-language)
+  (defvar w3m-use-symbol)
+  (autoload 'w3m-mule-unicode-p "w3m"))
 
 (defgroup w3m-symbol nil
   "Symbols for w3m"
@@ -39,23 +42,22 @@
 
 (defvar w3m-symbol-custom-type
   '(list
-    :convert-widget
-    (lambda (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)))
-	`(list :indent 4 :tag "Customize"
-	       :args (,@c ,@c ,@c ,@c ,@d ,@d ,b ,b))))))
+    :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
   '("-+" " |" "--" " +" "-|" " |" "-+" ""
@@ -177,6 +179,13 @@
 			  :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)
@@ -186,27 +195,35 @@
 	      w3m-mule-unicode-symbol))
 	((let ((lang (or w3m-language
 			 (and (boundp 'current-language-environment)
-			      (symbol-value '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 ()
-  (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))))))))
+  (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)
 
Only in work/emacs-w3m-1.4.4/: w3m-symbol.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-tabmenu.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-tabmenu.el
--- work/emacs-w3m-1.4.4/w3m-tabmenu.el	2005-03-18 21:51:56.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-tabmenu.el	2012-02-13 09:46:40.000000000 +0900
@@ -1,6 +1,6 @@
-;;; w3m-tabmenu.el --- Functions for TAB menu browsing
+;;; w3m-tabmenu.el --- Functions for TAB menu browsing -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2007, 2009, 2011-2012
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Hideyuki SHIRAI    <shirai@meadowy.org>,
@@ -20,9 +20,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -40,19 +40,18 @@
 (require 'w3m)
 (require 'easymenu)
 
-(defvar w3m-tab-menubar-dummy
-  '("TAB"
-    ["dummy" w3m-switch-buffer t]))
-
 (defun w3m-setup-tab-menu ()
   "Setup w3m tab menubar."
   (when w3m-use-tab-menubar
-    (unless (lookup-key w3m-mode-map [menu-bar w3m-tab])
-      (w3m-static-if (featurep 'xemacs)
-	  (progn
-	    (set-buffer-menubar (cons w3m-tab-menubar-dummy current-menubar))
-	    (add-hook 'activate-menubar-hook 'w3m-tab-menubar-update))
-	(define-key w3m-mode-map [menubar w3m-tab] w3m-tab-menubar-dummy)
+    (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 ()
@@ -93,45 +92,96 @@
   (when (get-buffer buf)
     (switch-to-buffer buf)))
 
-;;; w3m-tabmenu.el ends here
-;; Silence the byte compiler.  `w3m-tab-menubar-update' uses it to
-;; disable the iswitchb keymap, but it will never be used in Emacs 19
-;; since the Emacs version in which iswitchb.el appeared is 20.1.
-(eval-when-compile
-  (autoload 'easy-menu-remove-item "easymenu"))
-
 (defun w3m-tab-menubar-update ()
   "Update w3m tab menubar."
-  (when (and (boundp 'iswitchb-global-map)
-	     (keymapp (symbol-value 'iswitchb-global-map)))
-    ;; Don't let iswitchb manage the w3m tab menubar.
-    (easy-menu-remove-item (symbol-value 'iswitchb-global-map)
-			   '(menu-bar)
-			   (car w3m-tab-menubar-dummy)))
   (when (and (eq major-mode 'w3m-mode)
 	     (w3m-static-if (featurep 'xemacs)
 		 (frame-property (selected-frame) 'menubar-visible-p)
 	       menu-bar-mode))
-    (easy-menu-change nil
-		      (car w3m-tab-menubar-dummy)
-		      (w3m-tab-menubar-make-items))))
-
-(defun w3m-tab-menubar-make-items (&optional nomenu)
-  "Create w3m tab menu items."
-  (let ((i 0) (current (current-buffer)))
+    (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)
-		 (w3m-buffer-title buffer)
+		 (format "%s%s"
+			 (if (w3m-unseen-buffer-p buffer) "(u)" "")
+			 (w3m-buffer-title buffer))
 		 (eq buffer current))
-	 (vector (format "%d: %s%s"
+	 (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)
-			 (if (eq buffer current) "* " "  ")
-			 (w3m-buffer-title buffer))
+			 (cond ((eq buffer current) "* ")
+			       (unseen "u ")
+			       (t "  "))
+			 title)
 		 `(w3m-tab-menubar-open-item ,(buffer-name buffer))
 		 buffer)))
-     (w3m-list-buffers))))
+     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)
 
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-ucs.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-ucs.el
--- work/emacs-w3m-1.4.4/w3m-ucs.el	2003-11-05 21:40:28.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-ucs.el	2007-10-17 20:15:57.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3m-ucs.el --- CCL programs to process Unicode.
 
-;; Copyright (C) 2001 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001, 2005, 2007 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          ARISAWA Akihiro <ari@mbf.sphere.ne.jp>
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -35,18 +35,19 @@
 ;;    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
-    (cond
-     ((featurep 'xemacs)
-      "w3m-xmas")
-     ((> emacs-major-version 20)
-      "w3m-e21")
-     ((= emacs-major-version 20)
-      "w3m-e20"))))
+  (autoload 'w3m-make-ccl-coding-system "w3m"))
 
 (defun w3m-ucs-to-char (codepoint)
   (condition-case nil
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-util.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-util.el
--- work/emacs-w3m-1.4.4/w3m-util.el	2005-03-22 17:05:20.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-util.el	2013-02-04 14:49:00.000000000 +0900
@@ -1,7 +1,6 @@
 ;;; w3m-util.el --- Utility macros and functions for emacs-w3m
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001-2013 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
@@ -26,9 +25,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -48,6 +47,9 @@
   (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)
@@ -56,59 +58,48 @@
   (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
-  (dont-compile
-    (condition-case nil
-	:symbol-for-testing-whether-colon-keyword-is-available-or-not
-      (void-variable
-       (let (w3m-colon-keywords)
-	 (load "w3m-kwds.el" nil t t)
-	 (while w3m-colon-keywords
-	   (set (car w3m-colon-keywords) (car w3m-colon-keywords))
-	   (setq w3m-colon-keywords (cdr w3m-colon-keywords))))))))
-
-(eval-and-compile
-  (cond
-   ((or (featurep 'xemacs)
-	(< emacs-major-version 20))
+  (when (featurep 'xemacs)
     (require 'poe)
-    (require 'poem))))
-
-(eval-and-compile
-  (cond ((= emacs-major-version 19)
-	 (autoload 'cancel-timer "timer")
-	 (autoload 'regexp-opt "regexp-opt")
-	 (require 'custom))
-	((featurep 'xemacs)
-	 (autoload 'cancel-timer "w3m-xmas"))))
+    (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))
 
-;; (There are no objects so far.)
-
+;; XEmacs 21.4 wants this.
+(defalias 'w3m-make-local-hook (if (featurep 'xemacs)
+				   'make-local-hook
+				 'ignore))
 
 ;;; 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)))))
+  (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)))))
+      `(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)))))
+    `(progn ,@body)))
 
 (defmacro w3m-static-cond (&rest clauses)
   "Like `cond', except that it evaluates CONDITION part of each clause at
@@ -119,15 +110,15 @@
   (if clauses
       (cons 'progn (cdr (car clauses)))))
 
-(put 'w3m-condition-case lisp-indent-function 2)
+(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)))))
+  `(if (or debug-on-error debug-on-quit)
+       ,bodyform
+     (condition-case ,var
+	 ,bodyform
+       ,@handlers)))
 
 
 ;;; Text props:
@@ -140,26 +131,63 @@
 	     '(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)))))
+    `(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)))))
+  `(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.
@@ -167,8 +195,8 @@
 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))))
+      `(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.
@@ -176,8 +204,8 @@
 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))))
+      `(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.
@@ -185,8 +213,26 @@
 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))))
+      `(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-anchor-title (&optional position)
+  "Return the value of the `w3m-anchor-title' 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-anchor-title)
+    `(w3m-get-text-property-around 'w3m-anchor-title)))
 
 (defmacro w3m-submit (&optional position)
   "Return the value of the `w3m-submit' property at the given POSITION.
@@ -194,14 +240,14 @@
 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))))
+      `(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 ,position 'w3m-anchor-sequence)
     '(get-text-property (point) 'w3m-anchor-sequence)))
 
 
@@ -211,71 +257,83 @@
   ;; `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]*\\)"
+    "\\(\"\\([^\"]+\\)\"\\|'\\([^']+\\)'\\|[^\"'<> \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 form)
-  (` (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)
-       (,@ form))))
+(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:
 
-(defsubst w3m-get-buffer-create (name)
+(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)))
@@ -283,7 +341,7 @@
 	(buffer-disable-undo buf)
 	buf)))
 
-(defsubst w3m-kill-buffer (buffer)
+(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."
@@ -303,9 +361,11 @@
       (kill-buffer buf)))
   (setq w3m-work-buffer-list nil))
 
-(defsubst w3m-current-title ()
+(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)
@@ -316,40 +376,69 @@
        w3m-current-url)))
    (t "<no-title>")))
 
-(defsubst w3m-buffer-title (buffer)
+(defun w3m-buffer-title (buffer)
   "Return the title of the buffer BUFFER."
   (with-current-buffer buffer
     (w3m-current-title)))
 
-(defsubst w3m-buffer-number (buffer)
+(defun w3m-buffer-number (buffer)
   (when (and (bufferp buffer)
-	     (string-match "\\`\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'"
+	     (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.
 
-(defsubst w3m-buffer-set-number (buffer number)
-  (unless (eq (w3m-buffer-number buffer) number)
-    (with-current-buffer buffer
-      (let ((newname (if (= number 1)
+(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))))
+		       (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)
+  (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)
+      (if (string-match "\\*w3m\\*\\(<\\([0-9]+\\)>\\)?\\'" y)
 	  (< (cdr x)
 	     (if (match-beginning 1)
 		 (string-to-number (match-string 2 y))
@@ -368,9 +457,26 @@
 	(set-buffer (setq buffer (pop buffers)))
 	(when (eq major-mode 'w3m-mode)
 	  (push buffer rest))))
-    (if nosort
-	(nreverse rest)
-      (sort rest #'w3m-buffer-name-lessp))))
+    (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:
@@ -392,38 +498,44 @@
 	   (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."
-  (if (featurep 'xemacs)
-      '(and w3m-pop-up-frames (device-on-window-system-p))
-    '(and w3m-pop-up-frames window-system)))
+  '(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)))
-	((<= emacs-major-version 19)
-	 nil)
 	(t
-	 '(and w3m-use-tab (>= emacs-major-version 21)))))
+	 '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."
-  (cond ((featurep 'xemacs)
-	 '(and w3m-pop-up-windows
-	       (not (w3m-use-tab-p))
-	       (not (get-buffer-window w3m-select-buffer-name))))
-	((<= emacs-major-version 19)
-	 '(and w3m-pop-up-windows
-	       (not (get-buffer-window w3m-select-buffer-name))))
-	(t
-	 '(and w3m-pop-up-windows
-	       (or (< emacs-major-version 21)
-		   (not (w3m-use-tab-p)))
-	       (not (get-buffer-window w3m-select-buffer-name))))))
+  '(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
@@ -435,63 +547,65 @@
   "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))
+	oframe popup-frame-p frame pop-up-frames buffers other)
+    (unless (eq window (selected-window))
+      (setq oframe (selected-frame)
+	    popup-frame-p (w3m-popup-frame-p))
+      (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))
-		 (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))))
-      ;; 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)))))
+		  (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))))
+	;; 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)
@@ -505,17 +619,12 @@
 version as follows:
 
 XEmacs          `create-frame-hook'
-Emacs 20-22     `after-make-frame-functions'
+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 (if (and (= emacs-major-version 19)
-			 ;; See frame.el in Emacs 19.
-			 (boundp 'nframe)
-			 (framep (symbol-value 'nframe)))
-		    (symbol-value 'nframe)
-		  (selected-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.
@@ -529,12 +638,9 @@
 	  (unless (memq frame w3m-initial-frames)
 	    (push frame w3m-initial-frames)))))))
 
-(add-hook (cond ((featurep 'xemacs)
-		 'create-frame-hook)
-		((>= emacs-major-version 20)
-		 'after-make-frame-functions)
-		((= emacs-major-version 19)
-		 'after-make-frame-hook))
+(add-hook (if (featurep 'xemacs)
+	      'create-frame-hook
+	    'after-make-frame-functions)
 	  'w3m-add-w3m-initial-frames)
 
 (defun w3m-delete-w3m-initial-frames (frame)
@@ -550,13 +656,8 @@
 
 (cond ((boundp 'delete-frame-functions)
        (add-hook 'delete-frame-functions 'w3m-delete-w3m-initial-frames))
-      ((>= emacs-major-version 21)
-       (add-hook 'delete-frame-hook 'w3m-delete-w3m-initial-frames))
       (t
-       (defadvice delete-frame (before delete-w3m-initial-frames activate)
-	 "Remove the frame to be deleted from `w3m-initial-frames'."
-	 (w3m-delete-w3m-initial-frames (or (ad-get-arg 0)
-					    (selected-frame))))))
+       (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.
@@ -611,9 +712,12 @@
 			    (if (eq w exception)
 				(setq flag nil)
 			      (set-buffer (window-buffer w))
-			      (setq flag (memq major-mode
-					       '(w3m-mode
-						 w3m-select-buffer-mode))))))
+			      (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))
@@ -623,12 +727,70 @@
 		(delete-window window)))))))))
 
 
+;;; Navigation:
+
+(defmacro w3m-goto-next-defun (name property)
+  "Create function w3m-goto-next- NAME.
+Return position of the first occurence of PROPERTY.
+If currently over such PROPERTY, find next such occurence."
+  `(defun ,(intern (concat "w3m-goto-next-" (symbol-name name)))
+     (&optional pos)
+     ,(concat "Return position of next " (symbol-name name)
+	      " starting from POS or point.")
+     (setq pos (or pos (point)))
+     (if (get-char-property pos ',property) ; currently over such element
+	 (setq pos (next-single-property-change pos ',property)))
+     (if (or (get-char-property pos ',property)
+	     (setq pos (next-single-property-change pos ',property)))
+	 pos)))
+
+(w3m-goto-next-defun link w3m-href-anchor)
+(w3m-goto-next-defun image2 w3m-image)
+
+(defun w3m-goto-next-anchor-or-image (&optional pos)
+  "Return position of next anchor or image starting from POS or point."
+  (setq pos (or pos (point)))
+  (cond				; currently on anchor or image
+   ((w3m-anchor-sequence pos)
+    (setq pos (next-single-property-change pos 'w3m-anchor-sequence)))
+   ((w3m-image pos)
+    (setq pos (next-single-property-change pos 'w3m-image))))
+  (or (w3m-anchor-sequence pos)
+      (w3m-image pos)
+      (let ((image-pos (next-single-property-change pos 'w3m-image)))
+	(setq pos (next-single-property-change pos
+					       'w3m-anchor-sequence))
+	(and image-pos
+	     (or (not pos) (> pos image-pos))
+	     (setq pos image-pos))))
+  (if pos
+      (let ((hseq (w3m-anchor-sequence pos)))
+	(if (and hseq (text-property-any ; multiline anchors
+		       (point-min) pos 'w3m-anchor-sequence hseq))
+	    (w3m-goto-next-anchor-or-image pos)
+	  pos))))
+
+
 ;;; Miscellaneous:
 
 (defconst w3m-url-fallback-base "http:///")
 (defconst w3m-url-invalid-regexp "\\`http:///")
 
-(defsubst w3m-url-valid (url)
+(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)))))
+
+(defun w3m-url-valid (url)
   (and url (not (string-match w3m-url-invalid-regexp url))
        url))
 
@@ -687,7 +849,268 @@
 something like `(if foo \"bar\" \"baz\")' cannot be used."
   `(w3m-search-tag-1 ,(concat "<" (regexp-opt names t))))
 
-(defsubst w3m-time-newer-p (a b)
+(defun w3m-beginning-of-tag (&optional tag include-whitespace)
+  "Move point to the beginning of tag.  Inner nested tags are skipped.
+If TAG, which is a name of the tag, is given, this function moves point
+backward from the closing-tag </TAG> (point has to exist after or within
+it initially) to the beginning point of the open-tag <TAG ...>.  For
+example, in the following two situations, point moves backward from the
+rightmost tag to the beginning point of the leftmost tag:
+
+<TAG ...>...<TAG ...>...<TAG ...>...</TAG>...</TAG>...</TAG>
+<TAG ...>...<TAG ...>...</TAG>...<TAG ...>...</TAG>...</TAG>
+
+If TAG is omitted or nil, this function moves point backward to the
+beginning point of the tag in which point exists.  In this case, point
+has to initially exist between the end position of the closing-tag and
+the previous tag as follows:
+
+<!-- foo <bar ...<baz ...>...> -->
+                              ^^^
+If INCLUDE-WHITESPACE is non-nil, include leading and trailing
+whitespace.  Return the end-point and set the match-data #0, #1, #2,
+and #3 as follows (\"___\" shows whitespace):
+
+The case where TAG is spefified:
+___<TAG ...>___...___</TAG>___
+   0        1  2  2  1     0     INCLUDE-WHITESPACE=nil
+0  1        2  3  3  2     1  0  INCLUDE-WHITESPACE=non-nil
+
+The case where TAG is nil:
+___<TAG ...>___
+   0        0     INCLUDE-WHITESPACE=nil
+0  1        1  0  INCLUDE-WHITESPACE=non-nil"
+  (let ((init (point))
+	(num 1)
+	(md (match-data))
+	(case-fold-search t)
+	end regexp nd1 nd2 nd3 st1 st2 st3 st0 nd0)
+    (condition-case nil
+	(progn
+	  (if tag
+	      (progn
+		(setq end (point)
+		      tag (regexp-quote tag))
+		(if (and (re-search-backward (concat "\
+\\(<[\t\n\r ]*/[\t\n\r ]*" tag "\
+\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>\\)[\t\n\r ]*") nil t)
+			 (eq end (match-end 0)))
+		    (progn
+		      (setq nd1 (nth 3 (match-data)) ;; (match-end 1)
+			    nd2 (nth 2 (match-data))) ;; (match-beginning 1)
+		      (skip-chars-backward "\t\n\r ")
+		      (setq nd3 (point-marker))
+		      (goto-char end))
+		  (goto-char end)
+		  (search-forward ">")
+		  (setq end (point))
+		  (if (and (re-search-backward (concat "\
+<[\t\n\r ]*/[\t\n\r ]*" tag "\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>"))
+			   (eq end (match-end 0)))
+		      (progn
+			(setq nd1 (nth 1 (match-data)) ;; (match-end 0)
+			      nd2 (car (match-data))) ;; (match-beginning 0)
+			(skip-chars-backward "\t\n\r ")
+			(setq nd3 (point-marker)))
+		    (error "")))
+		(goto-char (1- nd2))
+		(setq regexp (concat "\\(<\\([\t\n\r ]*/\\)?[\t\n\r ]*" tag "\
+\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>\\)[\t\n\r ]*"))
+		(while (and (> num 0)
+			    (re-search-backward regexp))
+		  (setq num (if (match-beginning 2)
+				(1+ num)
+			      (1- num))))
+		(setq st1 (car (match-data)) ;; (match-beginning 0)
+		      st2 (nth 3 (match-data)) ;; (match-end 1)
+		      st3 (nth 1 (match-data)))) ;; (match-end 0)
+	    (search-forward ">")
+	    (setq nd1 (nth 1 (match-data))) ;; (match-end 0)
+	    (goto-char init)
+	    (while (and (> num 0)
+			(re-search-backward "\\(<\\)\\|>"))
+	      (setq num (if (match-beginning 1)
+			    (1- num)
+			  (1+ num))))
+	    (setq st1 (nth 2 (match-data)))) ;; (match-beginning 1)
+	  (if include-whitespace
+	      (progn
+		(skip-chars-backward "\t\n\r ")
+		(setq st0 (point-marker))
+		(goto-char nd1)
+		(skip-chars-forward "\t\n\r ")
+		(setq nd0 (point-marker))
+		(goto-char st0)
+		(set-match-data (if tag
+				    (list st0 nd0 st1 nd1 st2 nd2 st3 nd3)
+				  (list st0 nd0 st1 nd1))))
+	    (set-match-data (if tag
+				(list st1 nd1 st2 nd2 st3 nd3)
+			      (list st1 nd1))))
+	  (point))
+      (error
+       (set-match-data md)
+       (goto-char init)
+       nil))))
+
+(defun w3m-end-of-tag (&optional tag include-whitespace)
+  "Move point to the end of tag.  Inner nested tags are skipped.
+If TAG, which is a name of the tag, is given, this function moves point
+from the open-tag <TAG ...> (point has to exist in front of or within
+it initially) to the end point of the closing-tag </TAG>.  For example,
+in the following two situations, point moves from the leftmost tag to
+the end point of the rightmost tag:
+
+<TAG ...>...<TAG ...>...<TAG ...>...</TAG>...</TAG>...</TAG>
+<TAG ...>...<TAG ...>...</TAG>...<TAG ...>...</TAG>...</TAG>
+
+If TAG is omitted or nil, this function moves point to the end point of
+the tag in which point exists.  In this case, point has to initially
+exist between the beginning position of the tag and the next tag as
+follows:
+
+<!-- foo <bar ...<baz ...>...> -->
+ ^^^^^^^^
+If INCLUDE-WHITESPACE is non-nil, include leading and trailing
+whitespace.  Return the end-point and set the match-data #0, #1, #2,
+and #3 as follows (\"___\" shows whitespace):
+
+The case where TAG is spefified:
+___<TAG ...>___...___</TAG>___
+   0        1  2  2  1     0     INCLUDE-WHITESPACE=nil
+0  1        2  3  3  2     1  0  INCLUDE-WHITESPACE=non-nil
+
+The case where TAG is nil:
+___<TAG ...>___
+   0        0     INCLUDE-WHITESPACE=nil
+0  1        1  0  INCLUDE-WHITESPACE=non-nil"
+  (let ((init (point))
+	(num 1)
+	(md (match-data))
+	(case-fold-search t)
+	regexp st1 st2 st3 nd1 nd2 nd3 nd0 st0)
+    (condition-case nil
+	(progn
+	  (if tag
+	      (progn
+		(setq tag (regexp-quote tag))
+		(if (looking-at (concat "\
+\[\t\n\r ]*\\(<[\t\n\r ]*" tag "\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>\\)\
+\[\t\n\r ]*"))
+		    (setq st1 (nth 2 (match-data)) ;; (match-beginning 1)
+			  st2 (nth 3 (match-data)) ;; (match-end 1)
+			  st3 (nth 1 (match-data))) ;; (match-end 0)
+		  (search-backward "<")
+		  (if (looking-at (concat "\
+\\(<[\t\n\r ]*" tag "\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>\\)[\t\n\r ]*"))
+		      (setq st1 (car (match-data)) ;; (match-beginning 0)
+			    st2 (nth 3 (match-data)) ;; (match-end 1))
+			    st3 (nth 1 (match-data))) ;; (match-end 0)
+		    (error "")))
+		(goto-char (1+ st1))
+		(setq regexp (concat "\
+\[\t\n\r ]*\\(<\\([\t\n\r ]*/\\)?[\t\n\r ]*" tag "\
+\\(?:[\t\n\r ]*\\|[\t\n\r ]+[^>]+\\)>\\)"))
+		(while (and (> num 0)
+			    (re-search-forward regexp))
+		  (setq num (if (match-beginning 2)
+				(1- num)
+			      (1+ num))))
+		(setq nd1 (nth 3 (match-data)) ;; (match-end 1)
+		      nd2 (nth 2 (match-data)) ;; (match-beginning 1)
+		      nd3 (car (match-data)))) ;; (match-beginning 0)
+	    (search-backward "<")
+	    (setq st1 (car (match-data))) ;; (match-beginning 0)
+	    (goto-char init)
+	    (while (and (> num 0)
+			(re-search-forward "\\(>\\)\\|<"))
+	      (setq num (if (match-beginning 1)
+			    (1- num)
+			  (1+ num))))
+	    (setq nd1 (nth 3 (match-data)))) ;; (match-end 1)
+	  (if include-whitespace
+	      (progn
+		(skip-chars-forward "\t\n\r ")
+		(setq nd0 (point-marker))
+		(goto-char st1)
+		(skip-chars-backward "\t\n\r ")
+		(setq st0 (point-marker))
+		(goto-char nd0)
+		(set-match-data (if tag
+				    (list st0 nd0 st1 nd1 st2 nd2 st3 nd3)
+				  (list st0 nd0 st1 nd1))))
+	    (set-match-data (if tag
+				(list st1 nd1 st2 nd2 st3 nd3)
+			      (list st1 nd1))))
+	  (point))
+      (error
+       (set-match-data md)
+       (goto-char init)
+       nil))))
+
+(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."
@@ -697,7 +1120,7 @@
 	       (and (= (car a) (car b))
 		    (> (nth 1 a) (nth 1 b)))))))
 
-(defsubst w3m-time-lapse-seconds (start end)
+(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)
@@ -725,22 +1148,22 @@
 		 (t
 		  0)))))))
 
-(defsubst w3m-url-local-p (url)
+(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")
 
-(defsubst w3m-url-authinfo (url)
+(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 4 url))))
+	  (match-string 3 url))))
 
-(defsubst w3m-url-strip-authinfo (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)
@@ -748,13 +1171,13 @@
 	      (substring url (match-end 0)))
     url))
 
-(defsubst w3m-url-strip-fragment (url)
+(defun w3m-url-strip-fragment (url)
   "Remove the fragment identifier from the URL."
   (if (string-match "\\`\\([^#]*\\)#" url)
       (match-string 1 url)
     url))
 
-(defsubst w3m-url-strip-query (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)
@@ -769,7 +1192,7 @@
       (downcase (match-string 1 url))
     url))
 
-(defsubst w3m-which-command (command)
+(defun w3m-which-command (command)
   (when (stringp command)
     (if (and (file-name-absolute-p command)
 	     (file-executable-p command))
@@ -778,10 +1201,11 @@
       (catch 'found-command
 	(let (bin)
 	  (dolist (dir exec-path)
-	    (when (or (file-executable-p
-		       (setq bin (expand-file-name command dir)))
-		      (file-executable-p
-		       (setq bin (expand-file-name (concat command ".exe") dir))))
+	    (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)
@@ -790,32 +1214,31 @@
     (with-current-buffer (or buffer (current-buffer))
       (setq w3m-current-refresh nil)
       (when w3m-refresh-timer
-	(cancel-timer w3m-refresh-timer)
+	(w3m-static-if (featurep 'xemacs)
+	    (delete-itimer w3m-refresh-timer)
+	  (cancel-timer w3m-refresh-timer))
 	(setq w3m-refresh-timer nil)))))
 
-(defalias 'w3m-truncate-string
-  (cond ((featurep 'xemacs)
-	 ;; The function of the XEmacs version doesn't work correctly
-	 ;; for wide characters.
-	 (lambda (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))))
-	((fboundp 'truncate-string-to-width)
-	 'truncate-string-to-width)
-	(t
-	 'truncate-string)))
+(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)))
 
-(defsubst w3m-assoc-ignore-case (name alist)
+(defun w3m-assoc-ignore-case (name alist)
   "Return the element of ALIST whose car equals NAME ignoring its case."
   (let ((dname (downcase name))
 	match)
@@ -868,17 +1291,6 @@
 		   (string-as-unibyte string))))
     `(insert ,string)))
 
-(defconst w3m-default-face-colors
-  (eval '(if (not (or (featurep 'xemacs)
-		      (>= emacs-major-version 21)))
-	     (let ((bg (face-background 'default))
-		   (fg (face-foreground 'default)))
-	       (append (if bg `(:background ,bg))
-		       (if fg `(:foreground ,fg))))))
-  "The initial `default' face color spec.  Since `defface' under Emacs
-versions prior to 21 won't inherit the `dafault' face colors by default,
-we will use this value for the default `defface' color spec.")
-
 (defun w3m-custom-hook-initialize (symbol value)
   "Initialize the hook option pointed by the SYMBOL with the default VALUE."
   (if (boundp symbol)
@@ -889,6 +1301,12 @@
 	  (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
@@ -900,10 +1318,9 @@
 	 (setq zmacs-region-stays t))))
 
 (defmacro w3m-deactivate-region ()
-  "Deactivate the region.
-This macro does nothing in XEmacs, because the region is always
-deactivated after evaluating the current command."
-  (unless (featurep 'xemacs)
+  "Deactivate the region."
+  (if (featurep 'xemacs)
+      '(zmacs-deactivate-region)
     '(deactivate-mark)))
 
 (defmacro w3m-region-active-p ()
@@ -914,8 +1331,6 @@
 
 (eval-and-compile
   (cond
-   ((fboundp 'replace-in-string)
-    (defalias 'w3m-replace-in-string 'replace-in-string))
    ((fboundp 'replace-regexp-in-string)
     (defun w3m-replace-in-string  (string regexp newtext &optional literal)
       ;;(replace-regexp-in-string regexp newtext string nil literal)))
@@ -927,32 +1342,424 @@
       (funcall (symbol-function 'replace-regexp-in-string)
 	       regexp newtext string nil literal)))
    (t
-    (defun w3m-replace-in-string (string regexp newtext &optional literal)
-      (let ((start 0) tail)
-	(while (string-match regexp string start)
-	  (setq tail (- (length string) (match-end 0)))
-	  (setq string (replace-match newtext nil literal string))
-	  (setq start (- (length string) tail))))
-      string))))
+    (defalias 'w3m-replace-in-string 'replace-in-string))))
+
+(defun w3m-replace-regexps-in-string (string &rest regexps)
+  "In STRING replace an alist of REGEXPS."
+  (if (cadr regexps)
+      (w3m-replace-in-string
+       (apply #'w3m-replace-regexps-in-string string (cddr regexps))
+       (car regexps) (cadr regexps))
+    string))
+
+(if (fboundp 'string-match-p)
+    (defalias 'w3m-string-match-p 'string-match-p)
+  (defun w3m-string-match-p (regexp string &optional start)
+    "\
+Same as `string-match' except this function does not change the match data."
+    (save-match-data
+      (string-match regexp string start))))
+
+(if (fboundp 'substring-no-properties)
+    (defalias 'w3m-substring-no-properties 'substring-no-properties)
+  (defun w3m-substring-no-properties (string &optional from to)
+    "Return a substring of STRING, without text properties.
+It starts at index FROM and ending before TO.
+TO may be nil or omitted; then the substring runs to the end of STRING.
+If FROM is nil or omitted, the substring starts at the beginning of STRING.
+If FROM or TO is negative, it counts from the end.
+
+With one argument, just copy STRING without its properties."
+    (setq string (substring string (or from 0) to))
+    (set-text-properties 0 (length string) nil string)
+    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
-  (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))))))
+  ;; 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 (&optional buffer seconds)
+      "Update the header-line appearance in BUFFER after SECONDS.
+BUFFER defaults to the current buffer.  SECONDS defaults to 0.5."
+      (run-with-timer (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)))
+		      (or buffer (current-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))
+
+(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))))
+
+(defmacro w3m-interactive-p ()
+  (condition-case nil
+      (progn
+	(eval '(called-interactively-p 'any))
+	;; Emacs >=23.2
+	'(called-interactively-p 'any))
+    ;; Emacs <23.2
+    (wrong-number-of-arguments '(called-interactively-p))
+    ;; Old ones
+    (void-function '(interactive-p))))
+
+(defalias 'w3m-force-mode-line-update
+  (if (fboundp 'force-mode-line-update)
+      'force-mode-line-update
+    'redraw-modeline))
+
+;; `flet' and `labels' got obsolete since Emacs 24.3.
+(defmacro w3m-flet (bindings &rest body)
+  "Make temporary overriding function definitions.
+This is an analogue of a dynamically scoped `let' that operates on
+the function cell of FUNCs rather than their value cell.
+
+\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
+  (require 'cl)
+  (if (fboundp 'cl-letf)
+      `(cl-letf ,(mapcar (lambda (binding)
+			   `((symbol-function ',(car binding))
+			     (lambda ,@(cdr binding))))
+			 bindings)
+	 ,@body)
+    `(flet ,bindings ,@body)))
+(put 'w3m-flet 'lisp-indent-function 1)
+
+(defmacro w3m-labels (bindings &rest body)
+  "Make temporary function bindings.
+The bindings can be recursive and the scoping is lexical, but capturing
+them in closures will only work if `lexical-binding' is in use.  But in
+Emacs 24.2 and older, the lexical scoping is handled via `lexical-let'
+rather than relying on `lexical-binding'.
+
+\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
+  `(,(progn (require 'cl) (if (fboundp 'cl-labels) 'cl-labels 'labels))
+    ,bindings ,@body))
+(put 'w3m-labels 'lisp-indent-function 1)
+
+(eval-when-compile (require 'wid-edit))
+(defun w3m-widget-type-convert-widget (widget)
+  "Convert the car of `:args' as a widget type in WIDGET."
+  (require 'wid-edit)
+  (w3m-flet ((widget-sexp-value-to-internal (widget value) value))
+    (apply 'widget-convert (widget-type widget)
+	   (eval (car (widget-get widget :args))))))
+
+;;; 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)
 
Only in work/emacs-w3m-1.4.4/: w3m-util.elc
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-weather.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-weather.el
--- work/emacs-w3m-1.4.4/w3m-weather.el	2004-07-06 11:34:47.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-weather.el	2012-07-18 15:04:54.000000000 +0900
@@ -1,6 +1,7 @@
 ;;; w3m-weather.el --- Look weather forecast -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2001, 2002, 2003, 2005, 2012
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: w3m, WWW, hypermedia
@@ -18,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -226,7 +227,7 @@
 	      table))
 	   ;; 対応表に乗っている文字列を探す正規表現
 	   (hepburn-regexp
-	    (format "\\(\\`\\|[aiueo]\\)\\(n\\([^aiueoy]\\)\\|%s\\)"
+	    (format "\\(?:\\`\\|[aiueo]\\)\\(n\\([^aiueoy]\\)\\|%s\\)"
 		    (regexp-opt (mapcar (function car) hepburn-table))))
 	   ;; 長音の有無による派生形の表
 	   (prolonged-table
@@ -258,57 +259,57 @@
 		      table))
 	      table))
 	   ;; 派生形の表に乗っている文字列を探す正規表現
-	   (prolonged-regexp (format "\\(\\`\\|[aiueo]\\)\\(%s\\)"
+	   (prolonged-regexp (format "\\(?:\\`\\|[aiueo]\\)\\(%s\\)"
 				     (regexp-opt (mapcar (function car)
 							 prolonged-table)))))
-      (labels ((hepburn-candidates
-		(str)
-		"ヘボン式と訓令式の差によって生じる派生形を得る"
-		(if (string-match hepburn-regexp str)
-		    (let ((prefix (substring str 0 (match-beginning 2)))
-			  (candidates (if (match-beginning 3)
-					  '("n" "nn")
-					(assoc (match-string 2 str)
-					       hepburn-table)))
-			  (suffixes
-			   (hepburn-candidates
-			    (substring str (or (match-beginning 3)
-					       (match-end 0)))))
-			  (buf))
-		      (dolist (x candidates)
-			(dolist (y suffixes)
-			  (push (concat prefix x y) buf)))
-		      buf)
-		  (list str)))
-	       (prolonged-candidates
-		(str)
-		"長音の有無によって生じる派生形を得る"
-		(let (buf)
-		  (if (string-match prolonged-regexp str)
-		      (let ((prefix (substring str 0 (match-beginning 2)))
-			    (candidates (assoc (match-string 2 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)
-		"全ての派生形を得る"
-		(let (buf)
-		  (dolist (x (hepburn-candidates str))
-		    (dolist (y (prolonged-candidates x))
-		      (push y buf)))
-		  buf)))
+      (w3m-labels ((hepburn-candidates
+		    (str)
+		    "ヘボン式と訓令式の差によって生じる派生形を得る"
+		    (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)
+		    "長音の有無によって生じる派生形を得る"
+		    (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)
+		    "全ての派生形を得る"
+		    (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)))
@@ -367,7 +368,7 @@
     (let ((kanji "")
 	  (romaji "")
 	  (romaji-partial partial))
-      (when (string-match "\\`\\([^-a-zA-Z]+\\)" 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
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m-xmas.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-xmas.el
--- work/emacs-w3m-1.4.4/w3m-xmas.el	2005-03-24 08:27:22.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m-xmas.el	2012-12-17 20:34:21.000000000 +0900
@@ -1,6 +1,6 @@
-;;; w3m-xmas.el --- The stuffs to use emacs-w3m on XEmacs
+;;; w3m-xmas.el --- XEmacs stuff for emacs-w3m
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2010, 2012
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: Yuuichi Teranishi  <teranisi@gohome.org>,
@@ -21,14 +21,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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 use emacs-w3m on XEmacs.  For more
+;; This file contains XEmacs stuff that emacs-w3m uses.  For more
 ;; detail about emacs-w3m, see:
 ;;
 ;;    http://emacs-w3m.namazu.org/
@@ -36,23 +36,6 @@
 
 ;;; Code:
 
-;; Fix an XEmacs 21.5 bug in `call-process-region'.  It has been reported
-;; as <URL:http://news.gmane.org/group/gmane.emacs.xemacs.beta/thread=16564>.
-(when (and (executable-find "cat")
-	   (with-temp-buffer
-	     (insert "bar")
-	     (backward-char)
-	     (call-process-region (1- (point)) (point) "cat" t t)
-	     (goto-char (point-min))
-	     (not (looking-at "bar"))))
-  (defadvice call-process-region (around fix-xemacs-bug activate)
-    "Narrow to the specified region while running the original function.
-It fixes an XEmacs 21.5 bug.  Advised by emacs-w3m."
-    (save-restriction
-      (narrow-to-region (ad-get-arg 0) (ad-get-arg 1))
-      (goto-char (point-max))
-      ad-do-it)))
-
 (require 'w3m-util)
 (require 'w3m-proc)
 (require 'w3m-image)
@@ -67,9 +50,9 @@
   (defvar w3m-coding-system)
   (defvar w3m-current-title)
   (defvar w3m-current-url)
-  (defvar w3m-default-coding-system)
   (defvar w3m-display-inline-images)
   (defvar w3m-icon-directory)
+  (defvar w3m-menu-on-forefront)
   (defvar w3m-menubar)
   (defvar w3m-modeline-process-status-on)
   (defvar w3m-show-graphic-icons-in-mode-line)
@@ -79,10 +62,14 @@
   (defvar w3m-use-tab-menubar)
   (defvar w3m-work-buffer-name)
   (defvar w3m-work-buffer-list)
+  (defvar w3m-default-coding-system)
+  (defvar w3m-coding-system)
   (autoload 'update-tab-in-gutter "gutter-items")
   (autoload 'w3m-image-type "w3m")
   (autoload 'w3m-retrieve "w3m")
-  (autoload 'w3m-setup-tab-menu "w3m-tabmenu"))
+  (autoload 'w3m-setup-tab-menu "w3m-tabmenu")
+  (autoload 'w3m-setup-bookmark-menu "w3m-bookmark")
+  (autoload 'w3m-setup-session-menu "w3m-session"))
 
 ;; Dummies to shut some XEmacs variants up.
 (eval-when-compile
@@ -96,9 +83,18 @@
 (require 'pccl)
 
 ;;; Handle coding system:
-(defalias 'w3m-find-coding-system (if (fboundp 'find-coding-system)
-				      'find-coding-system
-				    'ignore))
+(eval-when-compile
+  (unless (fboundp 'find-coding-system)
+    (defalias 'find-coding-system 'ignore)
+    (defalias 'coding-system-name 'ignore)))
+
+(defalias 'w3m-find-coding-system
+  (if (fboundp 'find-coding-system)
+      (lambda (obj)
+	(and obj
+	     (setq obj (find-coding-system obj))
+	     (coding-system-name obj)))
+    'ignore))
 
 ;; Under XEmacs 21.5-b6 and later, `make-ccl-coding-system' will
 ;; signal an error if the coding-system has already been defined.
@@ -108,7 +104,7 @@
 ;;  (or (find-coding-system coding-system)
 ;;      (make-ccl-coding-system coding-system args...)))
 (eval-when-compile
-  (defmacro w3m-xmas-define-w3m-make-ccl-coding-system ()
+  (defmacro w3m-define-w3m-make-ccl-coding-system ()
     "Make the source form for the function `w3m-make-ccl-coding-system'."
     (if (and (fboundp 'make-ccl-coding-system)
 	     (fboundp 'find-coding-system))
@@ -123,7 +119,7 @@
 		coding-system mnemonic docstring decoder encoder)))
       '(defalias 'w3m-make-ccl-coding-system 'ignore))))
 
-(w3m-xmas-define-w3m-make-ccl-coding-system)
+(w3m-define-w3m-make-ccl-coding-system)
 
 (eval-and-compile
   (dolist (fn '(coding-priority-list
@@ -174,50 +170,75 @@
   "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."
-  (if (listp coding)
-      (with-temp-buffer
-	(insert str)
-	(let* ((orig-category-list (coding-priority-list))
-	       (orig-category-systems (mapcar #'coding-category-system
-					      orig-category-list))
-	       codesys category priority-list)
-	  (unwind-protect
-	      (progn
-		(while coding
-		  (setq codesys (car coding)
-			coding (cdr coding)
-			category (or (coding-system-category codesys)
-				     (coding-system-name codesys)))
-		  (unless (or (eq (coding-system-type codesys) 'undecided)
-			      (assq category priority-list))
-		    (set-coding-category-system category codesys)
-		    (push category priority-list)))
-		(set-coding-priority-list (nreverse priority-list))
-		;; `detect-coding-region' always returns `undecided'
-		;; ignoring `priority-list' in XEmacs 21.5-b19, but
-		;; that's okay.
-		(when (consp (setq codesys (detect-coding-region
-					    (point-min) (point-max))))
-		  (setq codesys (car codesys)))
-		(decode-coding-region (point-min) (point-max)
-				      (or codesys
-					  w3m-default-coding-system
-					  w3m-coding-system
-					  'iso-2022-7bit))
-		(buffer-string))
-	    (set-coding-priority-list orig-category-list)
-	    (while orig-category-list
-	      (set-coding-category-system (car orig-category-list)
-					  (car orig-category-systems))
-	      (setq orig-category-list (cdr orig-category-list)
-		    orig-category-systems (cdr orig-category-systems))))))
-    (decode-coding-string str coding)))
-
-(when (and (not (fboundp 'w3m-ucs-to-char))
-	   (fboundp 'unicode-to-char)
-	   (subrp (symbol-function 'unicode-to-char)))
-  (defun w3m-ucs-to-char (codepoint)
-    (unicode-to-char codepoint)))
+  (w3m-static-if (and (fboundp 'find-coding-system)
+		      (subrp (symbol-function 'find-coding-system)))
+      (if (listp coding)
+	  (with-temp-buffer
+	    (insert str)
+	    (let* ((orig-category-list (coding-priority-list))
+		   (orig-category-systems (mapcar #'coding-category-system
+						  orig-category-list))
+		   codesys category priority-list)
+	      (unwind-protect
+		  (progn
+		    (while coding
+		      (setq codesys (car coding)
+			    coding (cdr coding)
+			    category (or (coding-system-category codesys)
+					 (coding-system-name codesys)))
+		      (unless (or (eq (coding-system-type codesys) 'undecided)
+				  (assq category priority-list))
+			(set-coding-category-system category codesys)
+			(push category priority-list)))
+		    (set-coding-priority-list (nreverse priority-list))
+		    ;; `detect-coding-region' always returns `undecided'
+		    ;; ignoring `priority-list' in XEmacs 21.5-b19, but
+		    ;; that's okay.
+		    (when (consp (setq codesys (detect-coding-region
+						(point-min) (point-max))))
+		      (setq codesys (car codesys)))
+		    (decode-coding-region (point-min) (point-max)
+					  (or codesys
+					      w3m-default-coding-system
+					      w3m-coding-system
+					      'iso-2022-7bit))
+		    (buffer-string))
+		(set-coding-priority-list orig-category-list)
+		(while orig-category-list
+		  (set-coding-category-system (car orig-category-list)
+					      (car orig-category-systems))
+		  (setq orig-category-list (cdr orig-category-list)
+			orig-category-systems (cdr orig-category-systems))))))
+	(decode-coding-string str coding))
+    str))
+
+(eval-when-compile (autoload 'ucs-to-char "unicode"))
+
+;; This might be redefined by w3m-ucs.el.
+(cond ((and (fboundp 'unicode-to-char) ;; XEmacs 21.5.
+	    (subrp (symbol-function 'unicode-to-char)))
+       (if (featurep 'mule)
+	   (defalias 'w3m-ucs-to-char 'unicode-to-char)
+	 (defun w3m-ucs-to-char (codepoint)
+	   (or (unicode-to-char codepoint) ?~))))
+      ((featurep 'mule)
+       (defun w3m-ucs-to-char (codepoint)
+	 (if (fboundp 'ucs-to-char) ;; Mule-UCS is loaded.
+	     (progn
+	       (defalias 'w3m-ucs-to-char
+		 (lambda (codepoint)
+		   (condition-case nil
+		       (or (ucs-to-char codepoint) ?~)
+		     (error ?~))))
+	       (w3m-ucs-to-char codepoint))
+	   (condition-case nil
+	       (or (int-to-char codepoint) ?~)
+	     (error ?~)))))
+      (t
+       (defun w3m-ucs-to-char (codepoint)
+	 (condition-case nil
+	     (or (int-to-char codepoint) ?~)
+	   (error ?~)))))
 
 ;;; Handle images:
 
@@ -230,14 +251,8 @@
 circumstances."
   (and w3m-display-inline-images (device-on-window-system-p)))
 
-(defvar w3m-should-unoptimize-animated-gifs
-  (and (= emacs-major-version 21)
-       (or (>= emacs-minor-version 4)
-	   (and (= emacs-minor-version 2)
-		(>= (or emacs-patch-level emacs-beta-version) 20))))
-  "Specify whether w3m should unoptimize animated gif images for showing.
-It is applicable to XEmacs 21.2.20 or later, since which only support
-to show unoptimized animated gif images.")
+(defvar w3m-should-unoptimize-animated-gifs t
+  "Specify whether w3m should unoptimize animated gif images for showing.")
 
 (defvar w3m-should-convert-interlaced-gifs t
   "Specify whether w3m should convert interlaced gif images to be non-
@@ -291,7 +306,6 @@
 		(coding-system-for-write 'binary)
 		should-be-non-interlaced should-unoptimize size1 size2 glyph)
 	    (insert data)
-	    (goto-char (point-min))
 	    (when (looking-at "GIF8[79]")
 	      (call-process-region (point-min) (point-max)
 				   w3m-gifsicle-program
@@ -300,7 +314,7 @@
 	      ;; Check whether a `data' is interlaced.
 	      (setq should-be-non-interlaced
 		    (re-search-forward
-		     "  \\+ image #[0-9]+ \\([0-9]+x[0-9]+\\).* interlaced"
+		     "  \\+ image #[0-9]+ \\(?:[0-9]+x[0-9]+\\).* interlaced"
 		     nil t))
 	      (goto-char (point-min))
 	      ;; Check whether a `data' is optimized or larger than
@@ -371,19 +385,19 @@
       ;; Use a cached glyph.
       (cdr cache))))
 
-(defsubst w3m-make-glyph (data type)
+(defun w3m-make-glyph (data type)
   (or (and (eq type 'xbm)
 	   (let (width height content)
 	     (with-temp-buffer
 	       (insert data)
 	       (goto-char (point-min))
 	       (if (re-search-forward "width[ \t]+\\([0-9]+\\)")
-		   (setq width (string-to-int (match-string 1))))
+		   (setq width (string-to-number (match-string 1))))
 	       (if (re-search-forward "height[ \t]+\\([0-9]+\\)")
-		   (setq height (string-to-int (match-string 1))))
+		   (setq height (string-to-number (match-string 1))))
 	       (while (re-search-forward "0x\\(..\\)" nil t)
 		 (setq content (cons
-				(string-to-int
+				(string-to-number
 				 (match-string 1) 16) content)))
 	       (setq content (concat (nreverse content))))
 	     (make-glyph (vector 'xbm :data (list width height content)))))
@@ -403,20 +417,26 @@
 		  size)
       (w3m-process-do-with-temp-buffer
 	  (type (condition-case err
-		    (w3m-retrieve url 'raw no-cache nil referer handler)
+		    (w3m-retrieve url nil no-cache nil referer handler)
 		  (error (message "While retrieving %s: %s" url err) nil)))
-	(when type
+	(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))))
 	  (let ((data (buffer-string))
 		glyph)
-	    (setq glyph
-		  (when (w3m-image-type-available-p
-			 (setq type (w3m-image-type type)))
-		    (or (and (eq type 'gif)
-			     (or w3m-should-unoptimize-animated-gifs
-				 w3m-should-convert-interlaced-gifs)
-			     w3m-gifsicle-program
-			     (w3m-fix-gif url data no-cache))
-			(w3m-make-glyph data type))))
+	    (setq glyph (or (and (eq type 'gif)
+				 (or w3m-should-unoptimize-animated-gifs
+				     w3m-should-convert-interlaced-gifs)
+				 w3m-gifsicle-program
+				 (w3m-fix-gif url data no-cache))
+			    (w3m-make-glyph data type)))
 	    (if (and w3m-resize-images set-size)
 		(progn
 		  (setq size (cons (glyph-width glyph)
@@ -457,7 +477,7 @@
 		  (rate rate)
 		  fmt data)
       (w3m-process-do-with-temp-buffer
-	  (type (w3m-retrieve url 'raw nil nil referer handler))
+	  (type (w3m-retrieve url nil nil nil referer handler))
 	(when (w3m-image-type-available-p (setq type (w3m-image-type type)))
 	  (setq data (buffer-string)
 		fmt type)
@@ -511,39 +531,96 @@
   (and (device-on-window-system-p)
        (featurep image-type)))
 
+(defalias 'w3m-image-animate 'identity)
+
 ;;; Toolbar:
 (defcustom w3m-use-toolbar (and (featurep 'toolbar) t)
   "Non-nil activates toolbar of w3m."
   :group 'w3m
   :type 'boolean)
 
-(defun w3m-xmas-make-toolbar-buttons (buttons)
-  (dolist (button buttons)
-    (let ((up (expand-file-name (concat button "-up.xpm")
-				w3m-icon-directory))
-	  (down (expand-file-name (concat button "-down.xpm")
-				  w3m-icon-directory))
-	  (disabled (expand-file-name (concat button "-disabled.xpm")
-				      w3m-icon-directory))
-	  (icon (intern (concat "w3m-toolbar-" button "-icon"))))
-      (if (file-exists-p up)
-	  (set icon
-	       (toolbar-make-button-list
-		up
-		(and (file-exists-p down) down)
-		(and (file-exists-p disabled) disabled)))
-	(error "Icon file %s not found" up)))))
+(defcustom w3m-toolbar-icon-preferred-image-types '(xpm)
+  "List of image types that you prefer to use for the tool bar icons."
+  :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))
+	     (dolist (buffer (w3m-list-buffers t))
+	       (w3m-setup-toolbar t buffer))))))
+
+(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))
+	     (dolist (buffer (w3m-list-buffers t))
+	       (w3m-setup-toolbar t buffer))))))
+
+(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 XEmacs does not support are ignored."
+  (unless directory
+    (setq directory w3m-icon-directory))
+  (when (and directory
+	     (file-directory-p directory)
+	     (device-on-window-system-p))
+    (let* ((case-fold-search nil)
+	   (files (directory-files directory t
+				   (concat "\\`" (regexp-quote name) "\\.")))
+	   (types (append w3m-toolbar-icon-preferred-image-types
+			  (if (boundp 'image-formats-alist)
+			      (mapcar 'cdr
+				      (symbol-value 'image-formats-alist))
+			    '(png gif jpeg tiff xbm xpm bmp))))
+	   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))))
+			 type))
+	  (when (featurep 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 (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))))
+	    (set icon (if w3m-toolbar-use-single-image-per-icon
+			  (toolbar-make-button-list (car up))
+			(toolbar-make-button-list (car up)
+						  (car down)
+						  (car disabled))))
+	  (error "Icon file %s-up.* not found" button))))))
 
-(defun w3m-setup-toolbar ()
+(defun w3m-setup-toolbar (&optional force buffer)
   "Setup toolbar."
   (when (and w3m-use-toolbar
-	     w3m-icon-directory
-	     (file-directory-p w3m-icon-directory)
-	     (file-exists-p (expand-file-name "antenna-up.xpm"
-					      w3m-icon-directory)))
-    (w3m-xmas-make-toolbar-buttons w3m-toolbar-buttons)
+	     (w3m-find-image "antenna-up"))
+    (w3m-toolbar-make-buttons w3m-toolbar-buttons force)
     (set-specifier default-toolbar
-		   (cons (current-buffer) w3m-toolbar))
+		   (cons (or buffer (current-buffer)) w3m-toolbar))
     t))
 
 (defun w3m-update-toolbar ()
@@ -556,18 +633,47 @@
 		   (cons (current-buffer) w3m-toolbar))))
 
 ;;; Menu:
+(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
+      (let ((w3m (car (find-menu-item current-menubar '("w3m"))))
+	    (bookmark (car (find-menu-item current-menubar '("Bookmark"))))
+	    (tab (car (find-menu-item current-menubar '("Tab"))))
+	    (session (car (find-menu-item current-menubar '("Session"))))
+	    (items (copy-sequence current-menubar)))
+	(when (or w3m bookmark tab session)
+	  (setq items (delq session (delq tab (delq bookmark (delq w3m items)))))
+	  (set-buffer-menubar
+	   (cond (arg
+		  (append (delq nil (list w3m bookmark tab session)) items))
+		 ((memq nil items)
+		  (append (nreverse (cdr (memq nil (reverse items))))
+			  (delq nil (list w3m bookmark tab session))
+			  (memq nil items)))
+		 (t
+		  (nconc items (delq nil (list w3m bookmark tab session))))))))
+    (save-current-buffer
+      (dolist (buffer (w3m-list-buffers t))
+	(set-buffer buffer)
+	(w3m-menu-on-forefront arg t)))))
+
 (defun w3m-setup-menu ()
   "Define menubar buttons for XEmacs."
   (when (and (featurep 'menubar)
 	     current-menubar
 	     (not (assoc (car w3m-menubar) current-menubar)))
+    (w3m-setup-session-menu)
     (when w3m-use-tab-menubar (w3m-setup-tab-menu))
-    (set-buffer-menubar (cons w3m-menubar current-menubar))))
+    (w3m-setup-bookmark-menu)
+    (set-buffer-menubar (cons w3m-menubar current-menubar))
+    (w3m-menu-on-forefront w3m-menu-on-forefront t)))
 
 ;;; Widget:
 (eval-when-compile (require 'wid-edit))
 
-(defun w3m-xmas-define-missing-widgets ()
+(defun w3m-define-missing-widgets ()
   "Define some missing widgets."
   (unless (get 'coding-system 'widget-type)
     ;; The following codes are imported from wid-edit.el of Emacs 20.7.
@@ -616,14 +722,14 @@
       :format "%t%n"
       :value 'other)))
 
-(eval-after-load "wid-edit" '(w3m-xmas-define-missing-widgets))
+(eval-after-load "wid-edit" '(w3m-define-missing-widgets))
 
 ;;; Header line:
 (defvar w3m-header-line-map (make-sparse-keymap))
 (define-key w3m-header-line-map 'button2 'w3m-goto-url)
 
 ;;; Gutter:
-(defcustom w3m-xmas-show-current-title-in-buffer-tab
+(defcustom w3m-show-current-title-in-buffer-tab
   (and (boundp 'gutter-buffers-tab-enabled)
        gutter-buffers-tab-enabled)
   "If non-nil, show the title strings in the buffers tab.
@@ -637,32 +743,32 @@
 	 (prog2
 	     (or (boundp 'gutter-buffers-tab-enabled)
 		 (setq value nil))
-	     (set-default symbol value)
+	     (custom-set-default symbol value)
 	   (if value
-	       (add-hook 'w3m-display-functions 'w3m-xmas-update-tab-in-gutter)
-	     (remove-hook 'w3m-display-functions 'w3m-xmas-update-tab-in-gutter))
+	       (add-hook 'w3m-display-functions 'w3m-update-tab-in-gutter)
+	     (remove-hook 'w3m-display-functions 'w3m-update-tab-in-gutter))
 	   (condition-case nil
 	       (progn
 		 (if value
 		     (ad-enable-advice
 		      'format-buffers-tab-line 'around
-		      'w3m-xmas-show-current-title-in-buffer-tab)
+		      'w3m-show-current-title-in-buffer-tab)
 		   (ad-disable-advice
 		    'format-buffers-tab-line 'around
-		    'w3m-xmas-show-current-title-in-buffer-tab))
+		    'w3m-show-current-title-in-buffer-tab))
 		 (if (boundp 'gutter-buffers-tab-enabled)
 		     (mapc #'update-tab-in-gutter (frame-list))))
 	     (error)))))
 
 (when (boundp 'gutter-buffers-tab-enabled)
   (defadvice format-buffers-tab-line
-    (around w3m-xmas-show-current-title-in-buffer-tab (buffer) activate)
+    (around w3m-show-current-title-in-buffer-tab (buffer) activate)
     "Advised by emacs-w3m.
 Show the current title string in the buffer tab.  Unfortunately,
 existing XEmacs does not support showing non-ascii characters.  When a
 title contains non-ascii characters, show a url name by default."
     (with-current-buffer buffer
-      (if (and w3m-xmas-show-current-title-in-buffer-tab
+      (if (and w3m-show-current-title-in-buffer-tab
 	       (symbol-value 'gutter-buffers-tab-enabled)
 	       (eq 'w3m-mode major-mode))
 	  (let* ((len (specifier-instance
@@ -693,25 +799,25 @@
 		      name))))
 	ad-do-it)))
 
-  (if w3m-xmas-show-current-title-in-buffer-tab
+  (if w3m-show-current-title-in-buffer-tab
       (ad-enable-advice 'format-buffers-tab-line 'around
-			'w3m-xmas-show-current-title-in-buffer-tab)
+			'w3m-show-current-title-in-buffer-tab)
     (ad-disable-advice 'format-buffers-tab-line 'around
-		       'w3m-xmas-show-current-title-in-buffer-tab))
+		       'w3m-show-current-title-in-buffer-tab))
 
-  (defun w3m-xmas-setup-tab-in-gutter ()
+  (defun w3m-setup-tab-in-gutter ()
     "Set up buffers tab in the gutter."
     (set-specifier default-gutter-visible-p
 		   (and w3m-use-tab gutter-buffers-tab-enabled t)
 		   (current-buffer)))
-  (add-hook 'w3m-mode-setup-functions 'w3m-xmas-setup-tab-in-gutter)
-  (add-hook 'w3m-select-buffer-mode-hook 'w3m-xmas-setup-tab-in-gutter)
+  (add-hook 'w3m-mode-setup-functions 'w3m-setup-tab-in-gutter)
+  (add-hook 'w3m-select-buffer-mode-hook 'w3m-setup-tab-in-gutter)
 
-  (defun w3m-xmas-update-tab-in-gutter (&rest args)
+  (defun w3m-update-tab-in-gutter (&rest args)
     "Update the tab control in the gutter area."
     (when (and w3m-use-tab gutter-buffers-tab-enabled)
       (update-tab-in-gutter (selected-frame))))
-  (add-hook 'w3m-display-functions 'w3m-xmas-update-tab-in-gutter))
+  (add-hook 'w3m-display-functions 'w3m-update-tab-in-gutter))
 
 ;;; Graphic icons:
 (defcustom w3m-space-before-modeline-icon ""
@@ -731,32 +837,31 @@
 (defun w3m-initialize-graphic-icons (&optional force)
   "Make icon images which will be displayed in the modeline."
   (interactive "P")
-  (let ((defs '((w3m-modeline-status-off-icon
-		 "state-00.xpm"
-		 w3m-modeline-status-off)
-		(w3m-modeline-image-status-on-icon
-		 "state-01.xpm"
-		 w3m-modeline-image-status-on)
-		(w3m-modeline-ssl-status-off-icon
-		 "state-10.xpm"
-		 w3m-modeline-ssl-status-off)
-		(w3m-modeline-ssl-image-status-on-icon
-		 "state-11.xpm"
-		 w3m-modeline-ssl-image-status-on)))
-	def icon file status extent keymap)
+  ;; Prefer xpm icons rather than png icons since XEmacs doesn't display
+  ;; background colors of icon images other than xpm images transparently
+  ;; in the mode line.
+  (let* ((w3m-toolbar-icon-preferred-image-types '(xpm))
+	 (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 extent keymap)
     (while defs
       (setq def (car defs)
 	    defs (cdr defs)
 	    icon (car def)
-	    file (nth 1 def)
+	    file (car (nth 1 def))
+	    type (cdr (nth 1 def))
 	    status (nth 2 def))
-      (if (and w3m-show-graphic-icons-in-mode-line
-	       (device-on-window-system-p)
-	       (featurep 'xpm)
-	       w3m-icon-directory
-	       (file-directory-p w3m-icon-directory)
-	       (file-exists-p
-		(setq file (expand-file-name file w3m-icon-directory))))
+      (if (and w3m-show-graphic-icons-in-mode-line file)
 	  (progn
 	    (when (or force (not (symbol-value icon)))
 	      (unless extent
@@ -770,7 +875,7 @@
 	      (set icon
 		   (cons extent
 			 (make-glyph
-			  (make-image-instance (vector 'xpm :file file))))))
+			  (make-image-instance (vector type :file file))))))
 	    (when (stringp (symbol-value status))
 	      ;; Save the original status strings as properties.
 	      (put status 'string (symbol-value status)))
@@ -814,7 +919,6 @@
 			   format-alist)
 		       (with-temp-buffer
 			 (insert-file-contents file)
-			 (goto-char (point-max))
 			 (call-process-region
 			  (point-min) (point-max) w3m-gifsicle-program t t nil
 			  "--careful" "--delay" "10" "--loopcount=forever"
@@ -851,80 +955,6 @@
 	   (find-charset 'mule-unicode-e000-ffff)))
   (defalias 'w3m-mule-unicode-p 'ignore))
 
-(if (condition-case nil
-	(progn
-	  (unless (or itimer-process itimer-timer)
-	    (itimer-driver-start))
-	  ;; Check whether there is a bug to which the difference of
-	  ;; the present time and the time when the itimer driver was
-	  ;; woken up is subtracted from the initial itimer value.
-	  (let* ((inhibit-quit t)
-		 (ctime (current-time))
-		 (itimer-timer-last-wakeup
-		  (prog1
-		      ctime
-		    (setcar ctime (1- (car ctime)))))
-		 (itimer-list nil)
-		 (itimer (start-itimer "w3m-run-at-time" 'ignore 5)))
-	    (sleep-for 0.1) ;; Accept the timeout interrupt.
-	    (prog1
-		(> (itimer-value itimer) 0)
-	      (delete-itimer itimer))))
-      (error nil))
-    (if (condition-case nil
-	    (require 'timer-funcs)
-	  (error nil))
-	(defalias 'w3m-run-at-time 'run-at-time)
-      (defun w3m-run-at-time (time repeat function &rest args)
-	"Emulating function run as `run-at-time'.
-TIME should be nil meaning now, or a number of seconds from now.
-Return an itimer object which can be used in either `delete-itimer'
-or `cancel-timer'."
-	(apply #'start-itimer "w3m-run-at-time"
-	       function (if time (max time 1e-9) 1e-9)
-	       repeat nil t args)))
-  (defun w3m-run-at-time (time repeat function &rest args)
-    "Emulating function run as `run-at-time' in the right way.
-TIME should be nil meaning now, or a number of seconds from now.
-Return an itimer object which can be used in either `delete-itimer'
-or `cancel-timer'."
-    (let ((itimers (list nil)))
-      (setcar
-       itimers
-       (apply #'start-itimer "w3m-run-at-time"
-	      (lambda (itimers repeat function &rest args)
-		(let ((itimer (car itimers)))
-		  (if repeat
-		      (progn
-			(set-itimer-function
-			 itimer
-			 (lambda (itimer repeat function &rest args)
-			   (set-itimer-restart itimer repeat)
-			   (set-itimer-function itimer function)
-			   (set-itimer-function-arguments itimer args)
-			   (apply function args)))
-			(set-itimer-function-arguments
-			 itimer
-			 (append (list itimer repeat function) args)))
-		    (set-itimer-function
-		     itimer
-		     (lambda (itimer function &rest args)
-		       (delete-itimer itimer)
-		       (apply function args)))
-		    (set-itimer-function-arguments
-		     itimer
-		     (append (list itimer function) args)))))
-	      1e-9 (if time (max time 1e-9) 1e-9)
-	      nil t itimers repeat function args)))))
-
-(unless (fboundp 'cancel-timer)
-  (defun cancel-timer (timer)
-    "Remove TIMER from the list of active timers."
-    (or (itimerp timer)
-	(error "Invalid timer"))
-    (delete-itimer timer)
-    nil))
-
 (when (featurep 'mule)
   (defun w3m-window-hscroll (&optional window)
     "Replacement of `window-hscroll' for XEmacs-Mule.
@@ -936,8 +966,8 @@
 	  (epos (point-at-eol))
 	  (buf (window-buffer window)))
       (save-selected-window
-	(save-excursion
-	  (set-buffer buf)
+	(save-excursion ;; Don't replace it with:
+	  (set-buffer buf) ;; (with-current-buffer buf
 	  (beginning-of-line)
 	  (condition-case nil
 	      (forward-char hs)
@@ -967,6 +997,17 @@
 	(set-window-hscroll window (- (point) (point-at-bol))))))
   )
 
+(defun w3m-form-coding-system-accept-region-p (&optional from to coding-system)
+  "Check whether `coding-system' can encode specified region."
+  (let ((string (buffer-substring (or from (point-min))
+				  (or to   (point-max)))))
+    (unless (string= (decode-coding-string
+		      (encode-coding-string string coding-system)
+		      coding-system)
+		     string)
+      (message "Warning: this text may cause coding-system problem."))
+    t))
+
 (provide 'w3m-xmas)
 
 ;;; w3m-xmas.el ends here
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m.el
--- work/emacs-w3m-1.4.4/w3m.el	2013-06-14 14:07:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m.el	2013-06-14 14:09:11.000000000 +0900
@@ -1,7 +1,6 @@
-;;; w3m.el --- an Emacs interface to w3m
+;;; w3m.el --- an Emacs interface to w3m -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2000-2013 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
@@ -11,7 +10,7 @@
 ;;          Yuuichi Teranishi  <teranisi@gohome.org>,
 ;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
 ;;          Katsumi Yamaoka    <yamaoka@jpl.org>,
-;;          Tsuyoshi CHO       <mfalcon_sky@emailuser.net>
+;;          Tsuyoshi CHO       <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: w3m, WWW, hypermedia
 
 ;; This file is the main part of emacs-w3m.
@@ -27,9 +26,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -51,12 +50,13 @@
 
 ;;; Code:
 
-;; Developers, you must not use the cl functions (e.g., `butlast',
-;; `coerce', `merge', etc.) in any emacs-w3m or shimbun modules.  To
+;; 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 or w3m-om.el.
+;; 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))
 
@@ -79,7 +79,7 @@
 (require 'w3m-util)
 (require 'w3m-proc)
 
-;; Silence the Emacs' byte-compiler that says ``might not be defined''.
+;; Silence the Emacs's byte-compiler that says ``might not be defined''.
 (eval-when-compile
   (defalias 'w3m-setup-menu 'ignore))
 
@@ -87,51 +87,39 @@
   (cond
    ((featurep 'xemacs)
     (require 'w3m-xmas))
-   ((>= emacs-major-version 23)
-    ;; Emacs-w3m of the released version does not support Emacs 23+.
-    ;; We load w3m-e23.el(c) that exists in the same directory as
-    ;; w3m.el(c) so as to exclude ones in other places.
-    (unless (featurep 'w3m-e23)
-      (let ((files (list (and (boundp 'byte-compile-current-file)
-			      (symbol-value 'byte-compile-current-file))
-			 (and (boundp 'load-file-name)
-			      (symbol-value 'load-file-name))
-			 (locate-library "w3m")))
-	    file)
-	(while files
-	  (when (stringp (setq file (pop files)))
-	    (if (condition-case nil
-		    ;; `load' returns t if the file exists.
-		    (load (expand-file-name "w3m-e23"
-					    (file-name-directory file))
-			  nil t)
-		  (error nil))
-		(setq files nil)
-	      (unless files
-		(error "Emacs-w3m of this version does not support Emacs %d;\
- try the development version"
-		       emacs-major-version))))))))
    ((>= emacs-major-version 21)
-    (require 'w3m-e21))
-   ((= emacs-major-version 20)
-    (require 'w3m-e20))
-   ((boundp 'MULE)
-    (require 'w3m-om))
+    (require 'w3m-ems))
    (t
-    (require 'w3m-e19))))
+    (error "Emacs-w3m of this version no longer supports Emacs %s"
+	   (mapconcat 'identity
+		      (nbutlast (split-string emacs-version "\\."))
+		      ".")))))
 
+(unless (or (featurep 'xemacs) (< emacs-major-version 23))
+  (require 'bookmark-w3m))
+
+(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" nil t)
+  (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 link address of the current page to the bookmark." t)
+    "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)
@@ -158,6 +146,7 @@
   (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")
@@ -166,17 +155,65 @@
   (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 'widget-forward "wid-edit" nil t))
+  (autoload 'w3m-mail "w3m-mail" nil t)
+  (autoload 'w3m-lnum-mode "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-follow "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-goto "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-universal "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-toggle-inline-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-view-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-external-view-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-edit-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-print-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-download-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-bookmark-add-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-zoom-in-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-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)))
+    (defalias 'char-to-int 'identity))
+  (defvar bidi-paragraph-direction)
+  (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 "1.4.4"
+(defconst emacs-w3m-version
+  (eval-when-compile
+    (let ((rev "$Revision: 1.1600 $"))
+      (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
@@ -203,6 +240,14 @@
   :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'.")
@@ -214,13 +259,13 @@
 ;; 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"))
+      (setq w3m-command "@W3MPREFIX@/bin/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 "@W3MPREFIX@/bin/w3m")
 		       (w3m-which-command "w3mmee")
 		       (w3m-which-command "w3m-m17n"))))
       (when command
@@ -229,22 +274,20 @@
 	  (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)
+\\(?:\\.[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 9) 'w3mmee)
-		   ((match-beginning 8) 'w3m-m17n)
+		   ((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)
-				     (save-excursion (end-of-line)
-						     (point)))
+		  (or (split-string (buffer-substring (match-end 0)
+						      (point-at-eol))
 				    ",")
 		      (list nil)))
 	    (when (member "m17n" w3m-compile-options)
@@ -267,10 +310,10 @@
   :type 'boolean)
 
 (defcustom w3m-language
-  (if (or (and (boundp 'current-language-environment)
-	       (string= "Japanese"
-			(symbol-value 'current-language-environment)))
-	  (boundp 'MULE))
+  (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
@@ -281,9 +324,9 @@
 	       (case-fold-search t))
 	   (prog1
 	       (setq value (if (string-match "\\`japan" value) "Japanese"))
-	     (set-default symbol value))))
+	     (custom-set-default symbol value))))
   :set (lambda (symbol value)
-	 (set-default symbol (if (equal value "Japanese") "Japanese"))))
+	 (custom-set-default symbol (if (equal value "Japanese") "Japanese"))))
 
 (defcustom w3m-command-arguments
   (if (eq w3m-type 'w3mmee) '("-o" "concurrent=0" "-F") nil)
@@ -300,7 +343,7 @@
 
 \(setq w3m-command-arguments-alist
       '(;; Don't use the proxy server to visit local web pages.
-	(\"^http://\\\\([^/]*\\\\.\\\\)*your-company\\\\.com\\\\(/\\\\|$\\\\)\"
+	(\"^http://\\\\(?:[^/]*\\\\.\\\\)*your-company\\\\.com\\\\(?:/\\\\|$\\\\)\"
 	 \"-no-proxy\")
 	;; Use the proxy server to visit any foreign urls.
 	(\"\"
@@ -330,7 +373,7 @@
 	 (if (eq w3m-type 'w3mmee)
 	     (cons "W3MLANG" "ja_JP.kterm"))
 	 (if (eq system-type 'windows-nt)
-	     (cons "CYGWIN" "binmode tty"))))
+	     (cons "CYGWIN" "binmode"))))
   "*Alist of environment variables for subprocesses to inherit."
   :group 'w3m
   :type '(repeat
@@ -367,9 +410,10 @@
 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."
+`display-buffer-alist' (or `special-display-buffer-names' and
+`special-display-regexps' for old Emacsen), `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)
@@ -392,6 +436,18 @@
   :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.
@@ -434,6 +490,18 @@
   :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)
@@ -488,18 +556,12 @@
    ((not (featurep 'mule)) 'iso-8859-1)
    ((eq w3m-type 'w3mmee) 'ctext)
    ((eq w3m-type 'w3m-m17n)
-    (cond
-     ((and (equal "Japanese" w3m-language)
-	   (featurep 'w3m-e21)
-	   (not (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)))
+    (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."
@@ -512,12 +574,12 @@
     (if w3m-accept-japanese-characters
 	(if w3m-use-mule-ucs
 	    'w3m-euc-japan-mule-ucs
-	  (if (featurep 'w3m-e21)
+	  (if (featurep 'w3m-ems)
 	      'w3m-euc-japan
 	    'euc-japan))
       (if w3m-use-mule-ucs
 	  'w3m-iso-latin-1-mule-ucs
-	(if (featurep 'w3m-e21)
+	(if (featurep 'w3m-ems)
 	    'w3m-iso-latin-1
 	  'iso-8859-1))))
   "*Coding system used when writing to w3m processes.
@@ -560,6 +622,39 @@
   :group 'w3m
   :type '(repeat (coding-system :format "%t: %v\n" :size 0)))
 
+(defcustom w3m-url-coding-system-alist
+  '(("\\`https?://\\(?:[^./?#]+\\.\\)+google\\(?:\\.[^./?#]+\\)+/"
+     . (lambda (url)
+	 (if (string-match "&ie=\\([^&]+\\)" url)
+	     (w3m-charset-to-coding-system (match-string 1 url)))))
+    (nil . utf-8))
+  "Alist of url regexps and coding systems used to encode url to retrieve.
+The form looks like:
+  ((\"REGEXP\" . CODING) (\"REGEXP\" . CODING)...(nil . CODING))
+
+Where REGEXP is a regular expression that matches a url.  REGEXP nil
+means any url; element of which the car is nil, that is the default,
+has to be the last item of this alist.
+CODING is a coding system used to encode a url that REGEXP matches.
+CODING nil means using the coding system corresponding to a charset
+used to encode the current page.  CODING may also be a function that
+takes one argument URL and returns a coding system.
+
+If the example.com site requires a browser to use `shift_jis' to encode
+url for example, you can add it to this variable as follows:
+
+\(add-to-list
+ 'w3m-url-coding-system-alist
+ '(\"\\\\`https?://\\\\(?:[^./?#]+\\\\.\\\\)*example\\\\.com/\" . shift_jis))"
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 2
+		       (radio :format "%v"
+			      (const :format "Any " nil)
+			      regexp)
+		       (radio :format "%v"
+			      (const :format "Page's coding system " nil)
+			      coding-system))))
+
 (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
@@ -572,8 +667,7 @@
   ;; should never use CL macros like `caaaar', `when', `unless' ...
   :set (lambda (symbol value)
 	 (prog1
-	     ;; XEmacs 21.4.8 or Emacs 19 don't have `custom-set-default'.
-	     (set-default symbol value)
+	     (custom-set-default symbol value)
 	   (if (or noninteractive
 		   ;; Loading w3m.elc is just in progress...
 		   (not (featurep 'w3m)))
@@ -589,7 +683,7 @@
 					w3m-lynx-like-map)
 			 w3m-minor-mode-map (w3m-make-minor-mode-keymap))))
 	     (let ((buffers (buffer-list)))
-	       (save-excursion
+	       (save-current-buffer
 		 (while buffers
 		   (set-buffer (car buffers))
 		   (if (eq major-mode 'w3m-mode)
@@ -620,13 +714,13 @@
 (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.
+instead.  Nil means no init file will be loaded.
 
 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))
+  :type '(radio file (const :format "None " nil)))
 
 (defcustom w3m-default-save-directory
   (concat "~/." (file-name-sans-extension
@@ -635,6 +729,27 @@
   :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)
@@ -702,11 +817,11 @@
 	       (progn
 		 (if (file-directory-p
 		      (setq dir
-			    (expand-file-name "../../etc/w3m/" path)))
+			    (expand-file-name "../../etc/images/w3m/" path)))
 		     (throw 'found-dir dir))
 		 (if (file-directory-p
 		      (setq dir
-			    (expand-file-name "../etc/w3m/" path)))
+			    (expand-file-name "../etc/images/w3m/" path)))
 		     (throw 'found-dir dir))
 		 (if (file-directory-p
 		      (setq dir
@@ -714,13 +829,17 @@
 		     (throw 'found-dir dir))
 		 (if (file-directory-p
 		      (setq dir
+			    (concat (expand-file-name "../../etc/w3m/" path) (number-to-string emacs-major-version ) "/")))
+		     (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 "w3m")
+	  (or (locate-data-directory "images/w3m")
 	      (locate-data-directory "w3m")))
      (and (file-directory-p
-	   (setq dir (expand-file-name "w3m/" data-directory)))
+	   (setq dir (expand-file-name "images/w3m/" data-directory)))
 	  dir)
      (and (file-directory-p
 	   (setq dir (expand-file-name "w3m/icons/" data-directory)))
@@ -756,21 +875,17 @@
   "*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 '(list :convert-widget
-	       (lambda (widget)
-		 `(radio :args
-			 ,(append
-			   (if (getenv "HTTP_HOME")
-			       (list (list 'const
-					   :format "HTTP_HOME: \"%v\"\n"
-					   (getenv "HTTP_HOME"))))
-			   (if (getenv "WWW_HOME")
-			       (list (list '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)))))))
+  :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)
@@ -820,35 +935,52 @@
   :group 'w3m
   :type '(integer :size 0))
 
-(defface w3m-anchor-face
+(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-face
+(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-face
+(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-face
+(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-face
+(defface w3m-history-current-url
   ;; The following strange code compounds the attributes of the
-  ;; `secondary-selection' face and the `w3m-arrived-anchor-face' face,
+  ;; `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)
@@ -859,9 +991,8 @@
 	;; require `font' in Emacs/w3 and `cl' arbitrarily. :-/
 	(features (cons 'font features))
 	base-attributes attributes attribute)
-    (require 'wid-edit) ;; Needed only in Emacs 20.
     (setq base-attributes (funcall fn base nil)
-	  attributes (funcall fn 'w3m-arrived-anchor-face nil))
+	  attributes (funcall fn 'w3m-arrived-anchor nil))
     (while base-attributes
       (setq attribute (car base-attributes))
       (unless (memq attribute '(:foreground :underline))
@@ -871,26 +1002,50 @@
     (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-face `((t (,@w3m-default-face-colors :bold t)))
+(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-face `((t (,@w3m-default-face-colors :underline t)))
+(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-face
-  `((t (,@w3m-default-face-colors ,(if (featurep 'xemacs)
-				       :strikethru
-				     :strike-through)
-				  t)))
+(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)
 
-(defvar w3m-fontify-strike-through (or (featurep 'w3m-e21)
-				       (featurep 'w3m-xmas))
-  "Non-nil means use `strike-through' attribute to display deleted text.")
+(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.
@@ -922,6 +1077,7 @@
 
 (defcustom w3m-after-cursor-move-hook
   '(w3m-highlight-current-anchor
+    w3m-show-form-hint
     w3m-print-this-url
     w3m-auto-show)
   "*Hook run each time after the cursor moves in emacs-w3m buffers.
@@ -948,7 +1104,7 @@
   :group 'w3m
   :type 'boolean)
 
-;; As far as we know, Emacs 20/21 under Mac OS X[1] and XEmacs under
+;; 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
@@ -965,6 +1121,17 @@
   :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
@@ -989,15 +1156,33 @@
 	  (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
-		       ((fboundp 'browse-url-default-browser)
-			'browse-url-default-browser)
-		       ((fboundp 'browse-url-netscape)
-			'browse-url-netscape))
-		    (symbol-value 'browse-url-browser-function)))
+		  (let ((default
+			  (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))))
+		    (if (or (not (boundp 'browse-url-browser-function))
+			    (eq 'w3m-browse-url
+				(symbol-value 'browse-url-browser-function)))
+			default
+		      (if (functionp browse-url-browser-function)
+			  (symbol-value 'browse-url-browser-function)
+			(catch 'browser
+			  (let ((alist browse-url-browser-function))
+			    (while alist
+			      (when (string-match (caar alist) "index.html")
+				(throw 'browser (cdar alist)))
+			      (setq alist (cdr alist)))
+			    (message "Found no html handler in \
+browse-url-browser-function to put in w3m-content-type-alist.")
+			    default))))))
 		(when (w3m-which-command "netscape")
 		  (list "netscape" 'url)))))
 	 (image-viewer (or fiber-viewer
@@ -1006,6 +1191,10 @@
 	 (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))
@@ -1015,8 +1204,9 @@
 			  ((w3m-which-command "xpdf") (list "xpdf" 'file))
 			  ((w3m-which-command "acroread")
 			   (list "acroread" 'file))))))
-    `(("text/plain" "\\.\\(txt\\|tex\\|el\\)\\'" nil nil)
+    `(("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)
@@ -1028,13 +1218,36 @@
       ("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/xml" "\\.xml\\'" nil "text/plain")
+      ("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 file suffixes and content types."
+  "*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
@@ -1178,12 +1391,32 @@
   :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
@@ -1191,19 +1424,20 @@
 
 (defcustom w3m-use-filter nil
   "*Non-nil means use filter programs to convert web contents.
-See also `w3m-filter-rules'."
+See also `w3m-filter-configuration'."
   :group 'w3m
   :type 'boolean
   :require 'w3m-filter)
 
 (defcustom w3m-use-symbol
-  (and (featurep 'mule)
-       (eq w3m-type 'w3m-m17n)
-       (or (not (eq w3m-output-coding-system 'utf-8))
-	   (and (w3m-mule-unicode-p)
-		(>= emacs-major-version 21)
-		(or window-system (eq (terminal-coding-system) 'utf-8))))
-       t)
+  (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."
@@ -1227,7 +1461,7 @@
 (defcustom w3m-edit-function-alist
   '(("\\`[^?]+/hiki\\.cgi\\?" . hiki-edit-url))
   "*Alist of functions used for editing pages.
-This option is refered to decide which function shouled be used to
+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."
@@ -1256,8 +1490,7 @@
 
 (defcustom w3m-track-mouse t
   "*Whether to track the mouse and message the url under the mouse.
-This feature does not work under Emacs or XEmacs versions prior to 21.
-See also `show-help-function' if you are using Emacs 21 or later.
+See also `show-help-function' if you are using GNU Emacs.
 
 A tip for XEmacs users:
 
@@ -1283,99 +1516,49 @@
   :group 'w3m
   :type 'boolean)
 
-(defcustom w3m-show-decoded-url
-  '(("\\`http://\\([^./?#]+\\.\\)*wikipedia\\.org/" . 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 ;; ??
-					(or (and (< emacs-major-version 21)
-						 (not 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"
-		     (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.
-Unfortunately, users of Emacs 20 and less cannot enjoy the benefit.
 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,
@@ -1386,6 +1569,19 @@
   :group 'w3m
   :type 'boolean)
 
+(defcustom w3m-new-session-url "about:blank"
+  "*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'
@@ -1396,20 +1592,18 @@
   :group 'w3m
   :type 'boolean)
 
-(defcustom w3m-use-favicon (featurep 'w3m-image)
+(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)
-	      (featurep 'w3m-image)
 	      (w3m-favicon-usable-p)))
   :set (lambda (symbol value)
-	 (set-default symbol (and (not noninteractive)
-				  value
-				  (featurep 'w3m-image)
-				  (w3m-favicon-usable-p))))
+	 (custom-set-default symbol (and (not noninteractive)
+					 value
+					 (w3m-favicon-usable-p))))
   :group 'w3m
   :type 'boolean)
 
@@ -1419,7 +1613,7 @@
 `w3m-use-favicon' is non-nil."
   :set (lambda (symbol value)
 	 (prog1
-	     (set-default symbol value)
+	     (custom-set-default symbol value)
 	   (if (and (not noninteractive)
 		    ;; Make sure it is not the first time.
 		    (featurep 'w3m)
@@ -1456,18 +1650,20 @@
   :type 'boolean)
 
 (defcustom w3m-view-this-url-new-session-in-background nil
-  "Run `w3m-view-this-url' without switching to the newly created buffer.
-It is useful if you enabled the tabs line or the buffers selection
-window for the `w3m-select-buffer' feature.  Note that it is meaningful
-only when specifying a prefix argument to the `w3m-view-this-url'
-command or using the `w3m-view-this-url-new-session' command in order
-to create a new emacs-w3m session."
+  "*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."
+It allows not only the alist form but also XEmacs's plist form."
   :group 'w3m
   :type '(choice (group :inline t :tag "Frame Parameters (Emacs)"
 			(repeat :inline t :tag "Frame Parameters (Emacs)"
@@ -1513,9 +1709,9 @@
   :group 'w3m
   :type '(integer :size 0)
   :set (lambda (symbol value)
-	 (set-default symbol (if (and (integerp value) (> value 1))
-				 value
-			       4))))
+	 (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.
@@ -1538,17 +1734,45 @@
   :group 'w3m
   :type '(string :size 0))
 
-(defcustom w3m-local-find-file-regexps '(nil . "\\.html?\\'")
+(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 . \"\\\\.html?\\\\'\")' allows
+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.
+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."
@@ -1593,22 +1817,22 @@
   "*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)))))))))
+  :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\\)/"))
+    (cons "\\`http:" "\\`http://\\(?:localhost\\|127\\.0\\.0\\.1\\)/"))
   "*Rule of sending referers.
 There are five choices as the valid values of this option.
 
@@ -1632,7 +1856,7 @@
 
 \(setq w3m-add-referer
       '(\"\\\\`http:\"
-	. \"\\\\`http://\\\\([^./]+\\\\.\\\\)*example\\\\.net/\")\)
+	. \"\\\\`http://\\\\(?:[^./]+\\\\.\\\\)*example\\\\.net/\")\)
 "
   :group 'w3m
   :type '(choice
@@ -1658,6 +1882,18 @@
   :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")
@@ -1666,6 +1902,7 @@
     ("\\`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.
@@ -1695,248 +1932,287 @@
 "
   :group 'w3m
   :type '(repeat
-	  (list
-	   :convert-widget
-	   (lambda (widget)
-	     (require 'w3m-search)
-	     (list
-	      'choice :format "%[Value Menu%] %v" :tag "Replacing URI with"
-	      :args
-	      (append
-	       '((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 "")))
-	       (mapcar
-		(lambda (elem)
-		  (let ((engine (car elem))
-			prefix)
-		    (setq prefix (mapconcat 'identity
-					    (split-string (downcase engine))
-					    "-"))
-		    (list 'list
-			  :format "Quick Search:\n%v"
-			  :tag (concat "Quick Search: " prefix)
-			  (list 'regexp
-				:tag "Prefix URL Regexp"
-				(concat "\\`" (regexp-quote prefix) ":"))
-			  '(function-item :format "" w3m-search-uri-replace)
-			  (list '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
-			;; Fixing 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))))))))))
+	  :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\\|groups\\)\\.google\\.[^/]+/\\(search\\|groups\\)"
+     "\\`https?://\\(?: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>\\(?:下一頁\\|次へ\\|�4Y@=\\)</b>\\)")
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
+	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Previous</span>"
+	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
+	      "<b>\\(?:上一頁\\|前へ\\|�@L@|\\)</b>\\)")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`https?://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=/\\(intl/[^/]+/\\)?nav_next\\.gif")
+	      "><img src=http://i\\.yimg\\.jp/images/common/ar_next\\.gif")
      ,(concat "<a href=" w3m-html-string-regexp
-	      "><img src=/\\(intl/[^/]+/\\)?nav_previous\\.gif")
+	      "><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 ">次のページ</a>")
      ,(concat "<a href=" w3m-html-string-regexp ">前のページ</a>")
      nil nil)
-    (w3m-relationship-magicpoint-estimate))
+    (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
-	   (group :tag "Estimate relationships from anchors matching"
-		 (function :format "" w3m-relationship-simple-estimate)
+	   :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 "Previous")
-		 (regexp :tag "Start")
-		 (regexp :tag "Contents"))
+		 (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 "Arguments" sexp)))))
+		 (repeat :tag "Args" :extra-offset 1 (sexp :format "%v"))))))
 
-(defconst w3m-entity-alist
-  (append
-   (eval-when-compile
-     (let ((basic-entity-alist
-	    '(("nbsp" . " ")
-	      ("gt" . ">")
-	      ("lt" . "<")
-	      ("amp" . "&")
-	      ("quot" . "\"")
-	      ("apos" . "'")
-	      ("circ" . "^")
-	      ("tilde" . "~")))
-	   (latin1-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)))
-	   (greek-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))))
-       (append basic-entity-alist
-	       ;; latin1
-	       (mapcar
-		(lambda (entity)
-		  (cons (car entity)
-			(char-to-string
-			 (make-char (w3m-static-if (boundp 'MULE)
-					lc-ltn1
-				      'latin-iso8859-1)
-				    (cdr entity)))))
-		latin1-entity)
-	       ;; greek
-	       (mapcar
-		(lambda (entity)
-		  (cons (car entity)
-			(char-to-string
-			 (make-char (w3m-static-if (boundp 'MULE)
-					lc-grk
-				      'greek-iso8859-7)
-				    (cdr entity)))))
-		greek-entity))))
-   (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)))))
-       (append
-	(apply 'append
-	       (mapcar
-		(lambda (entities)
-		  (let ((code1 (car entities)))
-		    (mapcar
-		     (lambda (entity)
-		       (cons (car entity)
-			     (char-to-string
-			      (make-char 'mule-unicode-0100-24ff
-					 code1 (cdr entity)))))
-		     (cdr entities))))
-		`(,@latin-extended-a ,@latin-extended-b ,@general-punctuation
-		  ,@greek ,@letterlike-symbols ,@arrows
-		  ,@mathematical-operators ,@miscellaneous-technical)))
-	(mapcar
-	 (lambda (entity)
-	   (cons (car entity)
-		 (char-to-string
-		  (make-char 'mule-unicode-2500-33ff
-			     (car (cdr entity)) (cdr (cdr entity))))))
-	 suit)))))
-  "Alist of html character entities and values.")
+(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)
+
+(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
-  "&\\([a-z][a-z0-9]*\\|#[0-9]+\\|#x[0-9a-f]+\\)\\(;\\)?"
+  (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.")
 
-(defvar w3m-entity-db nil
-  "Hash table of `w3m-entity-alist'.
-The nil value means it has not been initialized.")
-
-(defconst w3m-entity-db-size 13 "Size of `w3m-entity-db'.")
-
 (defconst w3m-encoding-alist
   (eval-when-compile
     (apply 'nconc
@@ -1950,18 +2226,29 @@
 Decoders are specified by `w3m-decoder-alist' (which see).")
 
 (defconst w3m-emacs-w3m-icon "\
-R0lGODlhUwAOAPIFAP///38AvwAAv1Uq/AC/AL9/Af8AAAAAACH/C05FVFNDQVBFMi4wAwEA
-AAAh+QQEIQD/ACwAAAAAUwAOAEADwgi63P4wykldCBYDIRT33RYOQ0ScU1EAKrs2hqHEswzQ
-ynUte78vnA9DQGKQihIUQNliNGlQXGVKrVqv2Oy06Zr+vpqfcDgqAZDHCvPVVHFxcJsOAAbZ
-RWdkfn9GKSVtbC83NnE1WoiIblyJjY4KXIwSdXQ+GEKYIXtoZnoPa5CDoTUyMaVyOpRimkFC
-ngtHZksntAQKBCstkiyFvYeVGXeZCpzEsgt/EYGjv4aEPHPCIWNEJXppyLQVy6RSzlKP4eIJ
-ACH5BAQhAP8ALAAAAAABAAEAAAMCCAkAIfkEBCEA/wAsAQABAFEACwAAAx0Iutz+MMpJq704
-6827/2AojmRpnmiqrmzrvnBsJgAh+QQEIQD/ACwBAAQAEQAIAAADHAixAb6qMRgfZDbXHaem
-nBOKINmIpnSWqIe+TgIAIfkEBCEA/wAsCQAEABcACAAAAykYAcoNUEgBq1ALAxnp9tXzcFVX
-OtAITmS4fCYsuzHZnqhsg/geb7hKAgAh+QQEIQD/ACwXAAQAFAAIAAADJSgKzDKjAQjbYrXO
-uJ3AnEZZytdJoAZcKuqKIeduchaidjPOQAIAIfkEBCEA/wAsJgAEABUACAAAAyA4OtD+gJAm
-GVAQyodz3s5iRVI5RR/ordTJapP6OuacJQAh+QQEIQD/ACw2AAEAEAALAAADJgi6XO4sAqio
-nGU5ogjH0VZlYFN8VPoARAZZGviSlzpKdmneF5AAADs="
+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
@@ -1973,6 +2260,22 @@
   :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 \"^https?://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.")
@@ -1998,13 +2301,11 @@
 
 (defvar w3m-modeline-favicon nil
   "Modeline control for displaying a favicon.
-This variable will be made buffer-local under Emacs 21 and later or
-XEmacs.")
+This variable will be made buffer-local.")
 
 (defvar w3m-favicon-image nil
   "Favicon image of the page.
-This variable will be made buffer-local under Emacs 21 and later or
-XEmacs.")
+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.
@@ -2017,6 +2318,14 @@
 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
@@ -2042,6 +2351,8 @@
   "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)
@@ -2057,8 +2368,9 @@
 (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)
 
-(defsubst w3m-clear-local-variables ()
+(defun w3m-clear-local-variables ()
   (setq w3m-current-url nil
 	w3m-current-base-url nil
 	w3m-current-title nil
@@ -2071,9 +2383,10 @@
 	w3m-contents-url nil
 	w3m-max-anchor-sequence nil
 	w3m-current-refresh nil
-	w3m-current-ssl nil))
+	w3m-current-ssl nil
+	w3m-name-anchor-from-hist nil))
 
-(defsubst w3m-copy-local-variables (from-buffer)
+(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
@@ -2109,7 +2422,17 @@
 only in the echo area.")
 
 (defvar w3m-safe-url-regexp nil
-  "Regexp matching urls which are considered to be safe.")
+  "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)
@@ -2117,6 +2440,33 @@
 (defvar w3m-cache-hashtb nil)
 (defvar w3m-input-url-history nil)
 
+(defvar w3m-http-status-alist
+  '((400 . "Bad Request")
+    (401 . "Unauthorized")
+    (402 . "Payment Required")
+    (403 . "Forbidden")
+    (404 . "Not Found")
+    (405 . "Method Not Allowed")
+    (406 . "Not Acceptable")
+    (407 . "Proxy Authentication Required")
+    (408 . "Request Time-out")
+    (409 . "Conflict")
+    (410 . "Gone")
+    (411 . "Length Required")
+    (412 . "Precondition Failed")
+    (413 . "Request Entity Too Large")
+    (414 . "Request-URI Too Large")
+    (415 . "Unsupported Media Type")
+    (500 . "Internal Server Error")
+    (501 . "Not Implemented")
+    (502 . "Bad Gateway")
+    (503 . "Service Unavailable")
+    (504 . "Gateway Time-out")
+    (505 . "HTTP Version not supported"))
+  "Alist of HTTP status codes.")
+
+(defvar w3m-http-status nil)
+
 (defconst w3m-arrived-db-size 1023)
 (defvar w3m-arrived-db nil
   "Hash table, the arrived URLs database.
@@ -2135,9 +2485,10 @@
   '(("image/jpeg" . jpeg)
     ("image/gif" . gif)
     ("image/png" . png)
+    ("image/tiff" . tiff)
     ("image/x-xbm" . xbm)
     ("image/x-xpm" . xpm))
-  "Alist of content types and image types defined as the Emacs' features.")
+  "Alist of content types and image types defined as the Emacs's features.")
 
 (defconst w3m-toolbar-buttons
   '("back" "parent" "forward" "reload" "open" "home" "search" "image"
@@ -2146,7 +2497,7 @@
 
 (defconst w3m-toolbar
   (if (equal "Japanese" w3m-language)
-      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)));;ア
+      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp))) ;; ア
 	`([w3m-toolbar-back-icon w3m-view-previous-page
 				 (w3m-history-previous-link-available-p)
 				 "前のページに戻る"]
@@ -2199,63 +2550,133 @@
 ;; "View" is page viewing
 ;; "Show" is link list showing
 (defconst w3m-menubar
-  '("w3m"
-    ("Session"
-     ["Create New Session..." w3m-goto-url-new-session t]
-     ["Copy This Session" w3m-copy-buffer t]
-     "----" ;; separator
-     ["Move Previous Session" w3m-previous-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     ["Move Next Session" w3m-next-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     "----" ;; separator
-     ["Close This Session" w3m-delete-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     ) ;; end session
-    ["Download This URL" w3m-download-this-url t]
-    ["Download to..." w3m-download t]
-    "----" ;; separator
-    ["Back to Previous Page" w3m-view-previous-page
+  (let ((a (when w3m-use-japanese-menu
+	     (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)))) ;; ア
+    `("w3m"
+      [,(w3m-make-menu-item "この URL を新しいセッションで開く"
+	  "Open This URL in a new session")
+       w3m-view-this-url-new-session (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "この URL をダウンロードする" "Download This URL")
+       w3m-download-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "ダウンロード..." "Download to...")
+       w3m-download t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "前のページに戻る" "Back to Previous Page")
+       w3m-view-previous-page
+       (w3m-history-previous-link-available-p)]
+      [,(w3m-make-menu-item "次のページに移動する" "Forward to Next Page")
+       w3m-view-next-page
+       (w3m-history-next-link-available-p)]
+      [,(w3m-make-menu-item "上の階層に移動する" "Up to Parent Page")
+       w3m-view-parent-page
+       (w3m-parent-page-available-p)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "このページを外部ブラウザで開く"
+	  "Open This Page in an External Browser")
+       w3m-external-view-current-url w3m-current-url]
+      [,(w3m-make-menu-item "この URL を外部ブラウザで開く"
+	  "Open This URL in an External Browser")
+       w3m-external-view-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "このページのソースをコマンドに送る..."
+	  "Pipe Page Source to Command...")
+       w3m-pipe-source  w3m-current-url]
+      "----" ;; separator
+      (,(w3m-make-menu-item "再表示" "Redisplay")
+       [,(w3m-make-menu-item "このページを再取得する" "Reload This Page")
+	w3m-reload-this-page w3m-current-url]
+       [,(w3m-make-menu-item "すべてのページを再取得する" "Reload All Pages")
+       w3m-reload-all-pages (cdr (w3m-list-buffers))]
+       "----" ;; separator
+       [,(w3m-make-menu-item "画像表示の切替(全部)" "Toggle Images")
+	w3m-toggle-inline-images (w3m-display-graphic-p)]
+       [,(w3m-make-menu-item "画像表示の切替(この画像)" "Toggle This Image")
+	w3m-toggle-inline-image (w3m-image)]
+       [,(w3m-make-menu-item "画像表示を止める" "Turn off Images")
+	w3m-turnoff-inline-images (w3m-display-graphic-p)]
+       "----" ;; separator
+       [,(w3m-make-menu-item "再描画する" "Redisplay This Page")
+	w3m-redisplay-this-page w3m-current-url]
+       [,(w3m-make-menu-item "Charset を指定して再描画する"
+	   "Redisplay This Page with Charset")
+	w3m-redisplay-with-charset w3m-current-url]
+       [,(w3m-make-menu-item "Content-type を指定して再描画する"
+	   "Redisplay This Page with Content-type")
+	w3m-redisplay-with-content-type w3m-current-url]
+       [,(w3m-make-menu-item "指定した Charset と Content-type を破棄する"
+	   "Reset Charset and Content-type")
+	w3m-redisplay-and-reset w3m-current-url]
+       ) ;; end redisplay
+      [,(w3m-make-menu-item "ホームページへ移動" "Go to Home Page")
+       w3m-gohome w3m-home-page]
+      (,(w3m-make-menu-item "ブックマーク" "Bookmark")
+       [,(w3m-make-menu-item "ブックマークを表示" "View Bookmark")
+	w3m-bookmark-view t]
+       [,(w3m-make-menu-item "新しいセッションでブックマークを表示"
+			     "View Bookmark in a New Session")
+	w3m-bookmark-view-new-session t])
+      [,(w3m-make-menu-item "移動..." "Go to...")
+       w3m-goto-url t]
+      "----" ;; separator
+      (,(w3m-make-menu-item "履歴" "History")
+       [,(w3m-make-menu-item "木構造で履歴を表示" "Show a Visited URLs Tree")
+	w3m-history t]
+       [,(w3m-make-menu-item "リストで履歴を表示" "Show an Arrived URLs List")
+	w3m-db-history t]
+       ) ;; end history
+      [,(w3m-make-menu-item "インターネットでの検索..."
+			    "Search the Internet...")
+       w3m-search t]
+      [,(w3m-make-menu-item "新しいセッションで検索..."
+			    "Search the Internet in a New Session...")
+       w3m-search-new-session t]
+      [,(w3m-make-menu-item "天気予報" "Weather Forecast")
+       w3m-weather t]
+      [,(w3m-make-menu-item (concat a "ンテナで取得")
+			    "Investigate with Antenna")
+       w3m-antenna t]
+      (,(w3m-make-menu-item "ヘルプ" "Resource")
+       [,(w3m-make-menu-item "プロセスを中止する" "Cancel Process")
+	w3m-process-stop w3m-current-process]
+       [,(w3m-make-menu-item "ソースを見る" "View Source")
+	w3m-view-source t]
+       [,(w3m-make-menu-item "ヘッダーを見る" "View Header")
+	w3m-view-header t]
+       ) ;; end resource
+      "----" ;; separator
+      [,(w3m-make-menu-item "このページをメールで送る" "Mail this page")
+       w3m-mail (memq mail-user-agent w3m-mail-user-agents)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "バグレポートを送る" "Send a Bug Report")
+       report-emacs-w3m-bug t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "この URL を表示する" "Print the Current URL")
+       w3m-print-current-url t]
+      [,(w3m-make-menu-item "w3m を閉じる" "Close w3m")
+       w3m-close-window t]
+      [,(w3m-make-menu-item "w3m を終了する" "Quit w3m")
+       w3m-quit t]
+      )) ;; end w3m
+  "Menubar definition for emacs-w3m.")
+
+(defvar w3m-rmouse-menubar
+  `("w3m"
+    [,(w3m-make-menu-item "前のページに戻る" "Back to Previous Page")
+     w3m-view-previous-page
      (w3m-history-previous-link-available-p)]
-    ["Forward to Next Page" w3m-view-next-page
+    [,(w3m-make-menu-item "次のページに移動する" "Forward to Next Page")
+     w3m-view-next-page
      (w3m-history-next-link-available-p)]
-    ["Up to Parent Page" w3m-view-parent-page
+    [,(w3m-make-menu-item "上の階層に移動する" "Up to Parent Page")
+     w3m-view-parent-page
      (w3m-parent-page-available-p)]
-    ["Cancel Process" w3m-process-stop w3m-current-process]
-    ["Reload This Page" w3m-reload-this-page w3m-current-url]
-    ("Redisplay"
-     ["Toggle Images" w3m-toggle-inline-images (w3m-display-graphic-p)]
-     "----" ;; separator
-     ["Redisplay This Page" w3m-redisplay-this-page w3m-current-url]
-     ["Redisplay This Page with Charset"
-      w3m-redisplay-with-charset w3m-current-url]
-     ["Redisplay This Page with Content-type"
-      w3m-redisplay-with-content-type w3m-current-url]
-     ["Reset Charset and Content-type" w3m-redisplay-and-reset w3m-current-url]
-     ) ;; end redisplay
-    ["Search the Internet..." w3m-search t]
-    ["Go to Home Page" w3m-gohome w3m-home-page]
-    ["Go to..." w3m-goto-url t]
-    "----" ;; separator
-    ["View Bookmark" w3m-bookmark-view t]
-    ("History"
-     ["Show a Visited URLs Tree" w3m-history t]
-     ["Show an Arrived URLs List" w3m-db-history t]
-     )
-    ["Weather Forecast" w3m-weather t]
-    ["Investigate with Antenna" w3m-antenna t]
-    ("Resource"
-     ["View Source" w3m-view-source t]
-     ["View Header" w3m-view-header t]
-     ) ;; end resource
     "----" ;; separator
-    ["Send a Bug Report" report-emacs-w3m-bug t]
-    "----" ;; separator
-    ["Print the Current URL" w3m-print-current-url t]
-    ["Close w3m" w3m-close-window t]
-    ["Quit w3m" w3m-quit t]
-    );; end w3m
-  "Menubar definition for emacs-w3m.")
+    [,(w3m-make-menu-item "このページを再取得する" "Reload This Page")
+     w3m-reload-this-page w3m-current-url]
+    [,(w3m-make-menu-item "すべてのページを再取得する" "Reload All Pages")
+     w3m-reload-all-pages (cdr (w3m-list-buffers))]
+    [,(w3m-make-menu-item "プロセスを中止する" "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)
@@ -2264,20 +2685,6 @@
 (defconst w3m-work-buffer-name " *w3m-work*")
 (defconst w3m-select-buffer-name " *w3m buffers*")
 
-(defconst w3m-meta-content-type-charset-regexp
-  "<meta[ \t\n]+http-equiv=\"?Content-type\"?[ \t\n]+content\
-=\"?\\([^;]+\\);[ \t\n]*charset=\\([^\"]+\\)\"?[ \t\n]*/?>"
-  "Obsolete regular expression.
-This constant MUST NOT be used, because it is defined only to keep
-compatibility with old Gnus and will be removed soon.")
-
-(defconst w3m-meta-charset-content-type-regexp
-  "<meta[ \t\n]+content=\"?\\([^;]+\\);[ \t\n]*charset\
-=\\([^\"]+\\)\"?[ \t\n]+http-equiv=\"?Content-type\"?[ \t\n]*/?>"
-  "Obsolete regular expression.
-This constant MUST NOT be used, because it is defined only to keep
-compatibility with old Gnus and will be removed soon.")
-
 (defconst w3m-dump-head-source-command-arguments
   (cond ((eq w3m-type 'w3mmee)
 	 (list "-dump=extra,head,source"))
@@ -2311,45 +2718,58 @@
 	       "-o" "strict_iso2022=0"
 	       "-o" "fix_width_conv=1"
 	       "-o" "use_jisx0201=0"
-	       ;"-o" "ucs_conv=1"
+	       "-o" "ucs_conv=1"
 	       '(if (eq w3m-input-coding-system 'binary)
 		    (if charset (list "-I" 'charset))
-		  (list "-I" (if (eq w3m-input-coding-system 'utf-8)
-				 "UTF-8"
-			       "ISO-2022-JP-2")))
+		  (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"
-	       '(if (eq w3m-output-coding-system 'utf-8)
-		    "UTF-8"
-		  "ISO-2022-JP-2")))
+	       '(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
-  '("-T" "text/html" "-t" tab-width "-cols" (w3m-display-width))
+  (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\\|\
+  "\\`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\\|\
+  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
 db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
 \\|\\`about:/*blank/?\\'"
   "Regexp matching urls which aren't stored in the history.")
 
-(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.")
-
 (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'.")
@@ -2373,29 +2793,40 @@
 whose net_loc part is not empty, a null string or the localhost name
 to this function."
   (cond
-   ((string-match "\\`\\(\\(file:\\(//\\)?\\)\\|about://dtree\\)/" url)
+   ((string-match "\\`\\(\\(file:/\\{0,2\\}\\)\\|about://dtree\\)/" url)
     (setq url (substring url (match-end 1)))
-    ;; Strip the localhost name.
     (when (and (match-beginning 2) ;; file:
-	       (string-match (concat "\\`//\\(localhost\\|127\\.0\\.0\\.1\\|"
-				     (regexp-quote (system-name)) "\\)/")
-			     url))
-      (setq url (substring url (match-end 1))))
+	       (< (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.
-    (setq url
-	  (if (and w3m-treat-drive-letter
-		   (string-match
-		    "\\`/\\(\\([a-zA-Z]\\)[|:]?\\|cygdrive/\\([a-zA-Z]\\)\\)/"
-		    url))
-	      (concat (or (match-string 2 url) (match-string 3 url))
-		      ":/"
-		      (substring url (match-end 0)))
-	    url))
-    (if (file-exists-p url)
+    (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
-      (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)
+      (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)
@@ -2426,13 +2857,31 @@
 
 
 ;;; 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 (intern url w3m-arrived-db)))
+    (let ((ident (w3m-arrived-intern url)))
       (if (string-match "\\`\\([^#]+\\)#" url)
 	  (w3m-arrived-add (substring url 0 (match-end 1))
 			   title modification-time arrival-time
@@ -2447,30 +2896,30 @@
 	  (put ident 'content-type content-type)))
       (set ident arrival-time))))
 
-(defsubst w3m-arrived-p (url)
+(defun w3m-arrived-p (url)
   "Return non-nil if a page of URL has arrived."
   (or (string-match w3m-arrived-ignored-regexp url)
-      (intern-soft url w3m-arrived-db)))
+      (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 (intern-soft url w3m-arrived-db)))
+  (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))
 
-(defsubst w3m-arrived-put (url property 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 (intern-soft url w3m-arrived-db)))
+  (let ((symbol (w3m-arrived-intern url t)))
     (and symbol (put symbol property value))))
 
-(defsubst w3m-arrived-get (url property)
+(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 (intern-soft url w3m-arrived-db)))
+  (let ((symbol (w3m-arrived-intern url t)))
     (and symbol (get symbol property))))
 
 (defsetf w3m-arrived-get w3m-arrived-put)
@@ -2589,7 +3038,10 @@
     (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)
@@ -2632,6 +3084,11 @@
 	(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
@@ -2689,19 +3146,17 @@
   (if (featurep 'xemacs)
       (let ((str `(get-text-property (extent-start-position extent)
 				     ',property)))
-	`(if (>= emacs-major-version 21)
-	     (lambda (extent)
-	       (if (and w3m-track-mouse
-			(eq (extent-object extent) (current-buffer)))
-		   (w3m-url-readable-string ,str)))))
-    `(if (>= emacs-major-version 21)
-	 (lambda (window object pos)
-	   (if w3m-track-mouse
-	       (progn
-		 (w3m-message "")	; Clear the echo area.
-		 (w3m-url-readable-string
-		  (get-text-property pos ',property
-				     (window-buffer window)))))))))
+	`(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.
@@ -2727,21 +3182,39 @@
 		      (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 not in
-the minibuffer and `w3m-verbose' is nil.  When the cursor is in the
-minibuffer 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."
-  (if w3m-verbose
-      (apply (function message) args)
-    (if (eq (selected-window) (minibuffer-window))
-	(apply (function format) args)
-      (w3m-static-if (featurep 'xemacs)
-	  (display-message 'no-log (apply (function format) args))
-	(let (message-log-max)
-	  (apply (function message) args))))))
+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."
@@ -2791,13 +3264,7 @@
     (with-temp-buffer
       (when (condition-case nil
 		(let ((coding-system-for-read
-		       (or coding-system
-			   w3m-file-coding-system-for-read))
-		      (file-coding-system-for-read
-		       (or coding-system
-			   w3m-file-coding-system-for-read
-			   (if (boundp 'file-coding-system-for-read)
-			       (symbol-value 'file-coding-system-for-read)))))
+		       (or coding-system w3m-file-coding-system-for-read)))
 		  (insert-file-contents file))
 	      (error
 	       (message "Error while loading %s" file)
@@ -2819,8 +3286,7 @@
 non-nil, control chars will be represented with ^ as `cat -v' does."
   (when (and list (file-writable-p file))
     (with-temp-buffer
-      (let ((file-coding-system (or coding-system w3m-file-coding-system))
-	    (coding-system-for-write (or coding-system w3m-file-coding-system))
+      (let ((coding-system-for-write (or coding-system w3m-file-coding-system))
 	    (standard-output (current-buffer))
 	    (print-fn (if escape-ctl-chars
 			  'w3m-prin1
@@ -2861,7 +3327,25 @@
 	  (write-region (point-min) (point-max) file nil 'nomsg)
 	  (when mode (set-file-modes file mode)))))))
 
-(defun w3m-url-encode-string (str &optional coding)
+(defun w3m-url-coding-system (url)
+  "Return coding system suitable to URL to retrieve."
+  (let ((alist w3m-url-coding-system-alist)
+	(case-fold-search t)
+	elt coding)
+    (while alist
+      (setq elt (pop alist))
+      (if (or (not (car elt))
+	      (and (stringp (car elt)) (string-match (car elt) url)))
+	  (setq coding (cdr elt)
+		alist nil)))
+    (when (functionp coding)
+      (setq coding (funcall coding url)))
+    (or coding
+	w3m-current-coding-system
+	(cdr (assq nil w3m-url-coding-system-alist))
+	w3m-default-coding-system)))
+
+(defun w3m-url-encode-string (str &optional coding encode-space)
   (apply (function concat)
 	 (mapcar
 	  (lambda (ch)
@@ -2870,147 +3354,79 @@
 	      "%0D%0A")
 	     ((string-match "[-a-zA-Z0-9_:/.]" (char-to-string ch)) ; xxx?
 	      (char-to-string ch))	; printable
-	     ((char-equal ch ?\x20)	; space
+	     ((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))))
+	      (format "%%%02X" ch))))	; escape
+	  (encode-coding-string (or str "")
+				(or coding (w3m-url-coding-system str))))))
+
+(defun w3m-url-encode-string-2 (str)
+  "Encode `(' and `)', apt to be misidentified as boundaries."
+  (w3m-replace-in-string (w3m-replace-in-string str "(" "%28") ")" "%29"))
 
-(defun w3m-url-decode-string (str &optional coding)
+(defun w3m-url-decode-string (str &optional coding regexp)
+  (or regexp (setq regexp "%\\(?:\\([0-9a-f][0-9a-f]\\)\\|0d%0a\\)"))
   (let ((start 0)
-	(buf))
-    (while (string-match "+\\|%\\(0D%0A\\|\\([0-9a-fA-F][0-9a-fA-F]\\)\\)"
-			 str start)
+	(buf)
+	(case-fold-search t))
+    (while (string-match regexp str start)
       (push (substring str start (match-beginning 0)) buf)
-      (push (cond
-	     ((match-beginning 2)
-	      (vector (string-to-number (match-string 2 str) 16)))
-	     ((match-beginning 1) "\n")
-	     (t " "))
+      (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-static-if (and (featurep 'xemacs)
-			(featurep 'mule))
-	(w3m-decode-coding-string-with-priority str coding)
-      (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)))))
+    (w3m-decode-coding-string-with-priority str coding)))
 
 (defun w3m-url-readable-string (url)
-  "Return a readable string for a give encoded URL.
-If `w3m-show-decoded-url' has non-nil value, it is refered to decide
-a decoding scheme."
+  "Return a readable string for a given encoded URL."
   (when (stringp url)
-    (let ((rule
-	   (if (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))))))
-	     w3m-show-decoded-url)))
-      (if rule
-	  (w3m-url-decode-string url
-				 (if (eq t rule)
-				     w3m-coding-system-priority-list
-				   rule))
-	url))))
+    (setq url (w3m-puny-decode-url url))
+    (if (string-match "[^\000-\177]" url)
+	url
+      (w3m-url-decode-string url (w3m-url-coding-system url)))))
 
-(defsubst w3m-url-transfer-encode-string (url &optional coding)
+(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.
+Optional CODING is a coding system, that defaults to the one determined
+according to URL and `w3m-url-coding-system-alist', used to encode URL.
 
 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))
+  (unless coding
+    (setq coding (w3m-url-coding-system url)))
   (let ((start 0)
-	(buf))
+	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)))))
+			  (lambda (c) (format "%%%02X" c))
+			  (encode-coding-string (match-string 0 url) coding)))
 		  (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-db-setup ()
-  "Initialize the hash table of `w3m-entity-alist'."
-  (setq w3m-entity-db (make-vector w3m-entity-db-size 0))
-  (dolist (elem w3m-entity-alist)
-    (set (intern (car elem) w3m-entity-db)
-	 (cdr elem))))
-
-(eval-and-compile
-  (unless (fboundp 'w3m-ucs-to-char)
-    (defun w3m-ucs-to-char (codepoint)
-      "A dummy function defined since nothing provided the regular function.
-This function simply returns the arg if it is between 0x20 and 0x7e,
-otherwise returns the tilde character."
-      (if (or (< codepoint 32) (< 127 codepoint))
-	  ?~ ;; unsupported character
-	codepoint))))
-
-(defun w3m-entity-value (name strict)
+(defun w3m-entity-value (name)
   "Get a char corresponding to NAME from the html char entities database.
-The database is kept in `w3m-entity-db'.  If STRICT is non-nil, the
-exact match with NAME is made.  Otherwise, it allows trailing extra
-characters in NAME, but those characters appear in the return value.
-For example:
-
-\(w3m-entity-value \"ampersand\" t) => nil
-\(w3m-entity-value \"ampersand\" nil) => \"&ersand\""
-  (unless w3m-entity-db
-    ;; Initialize the hash table.
-    (w3m-entity-db-setup))
+The database is kept in `w3m-entity-table'."
   ;; Return a value of the specified entity, or nil if it is unknown.
-  (if (char-equal (string-to-char name) ?#)
-      (progn
-	(setq name (substring name 1))
-	(let ((codepoint (if (char-equal (string-to-char name) ?x)
-			     (string-to-number (substring name 1) 16)
-			   (string-to-number name))))
-	  (char-to-string (w3m-ucs-to-char codepoint))))
-    (let ((val (intern-soft name w3m-entity-db))
-	  (pre name)
-	  (post ""))
-      (if (not strict)
-	  (while (and (null val)
-		      (< 0 (length pre))
-		      (null (setq val (intern-soft pre w3m-entity-db))))
-	    (setq post (concat (substring pre -1) post)
-		  pre (substring pre 0 -1))))
-      (and val (concat (symbol-value val) post)))))
+  (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."
@@ -3020,8 +3436,17 @@
       (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-text-properties start (match-beginning 0)
-				 '(face w3m-bold-face))))))
+	(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."
@@ -3031,25 +3456,47 @@
       (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-text-properties start (match-beginning 0)
-				 '(face w3m-underline-face))))))
+	(w3m-add-face-property start (match-beginning 0) 'w3m-underline)))))
 
 (defun w3m-fontify-strike-through ()
   "Fontify strike-through text in the buffer containing halfdump."
-  (when (and w3m-fontify-strike-through
-	     (w3m-static-if (featurep 'xemacs)
-		 (device-on-window-system-p)
-	       window-system))
-    (goto-char (point-min))
-    (while (re-search-forward "\\[\\(DEL\\|S\\):" nil t)
+  (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 ":\\(DEL\\|S\\)]" nil t)
+	(when (re-search-forward "</s[ \t\r\f\n]*>" nil t)
 	  (delete-region (match-beginning 0) (match-end 0))
-	  (w3m-add-text-properties start (match-beginning 0)
-				   '(face w3m-strike-through-face)))))))
+	  (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)))))
 
-(defsubst w3m-decode-anchor-string (str)
+(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:
@@ -3060,8 +3507,9 @@
   ;; is replaced from "&" and embedded in the w3m's halfdump should be
   ;; restored into "&" some time.
   (let ((start 0) (buf))
-    (while (string-match "&amp;" str start)
-      (setq buf (cons "&" (cons (substring str start (match-beginning 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)))))
@@ -3080,9 +3528,9 @@
 
 (defun w3m-fontify-anchors ()
   "Fontify anchor tags in the buffer which contains halfdump."
-  (let ((help (w3m-make-help-echo w3m-href-anchor))
-	(balloon (w3m-make-balloon-help w3m-href-anchor))
-	prenames start end)
+  (let ((help (w3m-make-help-echo w3m-balloon-help))
+	(balloon (w3m-make-balloon-help w3m-balloon-help))
+	prenames start end bhhref)
     (goto-char (point-min))
     (setq w3m-max-anchor-sequence 0)	;; reset max-hseq
     (while (re-search-forward "<_id[ \t\r\f\n]+" nil t)
@@ -3092,15 +3540,18 @@
 	(delete-region start (point))
 	(w3m-add-text-properties start (point-max)
 				 (list 'w3m-name-anchor
-				       (cons id prenames)))))
+				       (cons (w3m-decode-entities-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
+      (w3m-parse-attributes (href name id charset title
 				  (rel :case-ignore) (hseq :integer))
 	(unless name
 	  (setq name id))
+	(when href
+	  (setq href (w3m-decode-anchor-string href)))
 	(when rel
 	  (setq rel (split-string rel))
 	  (cond
@@ -3115,34 +3566,41 @@
 	  (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)))
+	    (setq href (w3m-expand-url href))
 	    (unless (w3m-url-local-p href)
-	      (setq href (if (and (string-match w3m-url-components-regexp href)
-				  (match-beginning 8))
+	      (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))
+					(substring href 0 (match-beginning 8)))
 				       "#" tmp))
-			 (w3m-url-transfer-encode-string
-			  href
-			  (w3m-charset-to-coding-system charset)))))
+			 (w3m-url-transfer-encode-string href))))
 	    (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))
+	    (if title
+		(progn
+		  (setq title (w3m-decode-entities-string title))
+		  (setq bhhref (concat (w3m-decode-anchor-string title)
+				       "\n"
+				       (w3m-url-readable-string href))))
+	      (setq bhhref (w3m-url-readable-string href)))
 	    (w3m-add-text-properties start end
-				     (list 'face (if (w3m-arrived-p href)
-						     'w3m-arrived-anchor-face
-						   'w3m-anchor-face)
-					   'w3m-href-anchor href
+				     (list 'w3m-href-anchor href
+					   'w3m-balloon-help bhhref
+					   'w3m-anchor-title title
 					   'mouse-face 'highlight
 					   'w3m-anchor-sequence hseq
 					   'help-echo help
-					   'balloon-help balloon))
+					   '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-face
-					  'w3m-anchor-face))
+					    'w3m-arrived-anchor
+					  'w3m-anchor))
 		    (widget-mouse-face 'highlight)
 		    w)
 		(setq w (widget-convert-button 'default start end
@@ -3153,13 +3611,16 @@
 	    (when name
 	      (w3m-add-text-properties start (point-max)
 				       (list 'w3m-name-anchor2
-					     (cons name prenames))))))
+					     (cons (w3m-decode-entities-string name)
+						   prenames))))))
 	 (name
 	  (w3m-add-text-properties start (point-max)
 				   (list 'w3m-name-anchor2
-					 (cons name prenames)))))))
+					 (cons (w3m-decode-entities-string name)
+					       prenames)))))))
     (when w3m-icon-data
-      (setq w3m-icon-data (cons (w3m-expand-url (car 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
@@ -3175,28 +3636,30 @@
   (unless (featurep 'xemacs)
     (defun w3m-setup-menu ()
       "Define menubar buttons for Emacsen."
-      (let ((items (mapcar 'car (cdr (lookup-key global-map [menu-bar])))))
-	(when items
-	  ;; Place the W3M menu in the forefront of the menubar.
-	  (set (make-local-variable 'menu-bar-final-items)
-	       (delq 'w3m items))))
+      (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))))))
+	  (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-image))
-	(balloon (w3m-make-balloon-help w3m-image))
-	upper start end)
+  (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)
@@ -3205,48 +3668,186 @@
       (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))
-	  (unless (or (w3m-anchor start)
-		      (w3m-action start))
-	    ;; No need to use `w3m-add-text-properties' here.
-	    (add-text-properties start end (list 'face 'w3m-image-face
-						 'mouse-face 'highlight
-						 'help-echo help
-						 'balloon-help balloon))))))))
-
-(defsubst w3m-toggle-inline-images-internal (status no-cache url)
+					 '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."
-  (interactive "P")
   (let ((cur-point (point))
-	(buffer-read-only)
-	(end (point-min))
+	(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)))
+	  (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 (not url)
+	    (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)
@@ -3265,37 +3866,72 @@
 		     '(w3m-image-dummy t w3m-image "dummy"))
 		    (setq end (point)))
 		(goto-char cur-point)
-		(when (w3m-url-valid 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 (buffer-read-only)
-				    (w3m-insert-image start end image iurl))
-				  ;; Redisplay
-				  (when w3m-force-redisplay
-				    (sit-for 0)))
-			      (let (buffer-read-only)
-				(w3m-add-text-properties
-				 start end '(w3m-image-status off))))
-			    (set-buffer-modified-p nil))
-			  (set-marker start nil)
-			  (set-marker end nil)))))))))
+		(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)))
+	(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))
@@ -3316,82 +3952,148 @@
 	      ;; Remove dummy string.
 	      (delete-region start end)
 	      (setq end start))
-	     ((get-text-property start 'w3m-bitmap-image)
-	      (goto-char end)
-	      (setq end (w3m-remove-image start end)))
 	     (t (w3m-remove-image start end)))
-	    (w3m-add-text-properties start end '(w3m-image-status off))))
+	    (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.
+  "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 ((url (w3m-image))
-	(status (get-text-property (point) 'w3m-image-status))
-	(scale (get-text-property (point) 'w3m-image-scale)))
-    (if (and scale (equal status 'off))
-	(w3m-zoom-in-image 0)
-      (if (w3m-url-valid url)
-	  (progn
-	    (if force (setq status 'off))
-	    (w3m-toggle-inline-images-internal status no-cache url))
+  (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 (w3m-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.
-If FORCE is non-nil, displaying images is forced.  If NO-CACHE is
-non-nil, cached data will not be used."
+  "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")
-  (let ((status w3m-display-inline-images))
-    (unless (w3m-display-graphic-p)
-      (error "Can't display images in this environment"))
-    (if force (setq w3m-display-inline-images nil
-		    status nil))
-    (unwind-protect
-	(w3m-toggle-inline-images-internal (if w3m-display-inline-images
-					       'on 'off)
-					   no-cache nil)
-      (unless (setq w3m-display-inline-images (not status))
-	(w3m-process-stop (current-buffer)))
-      (force-mode-line-update))))
+  (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 (w3m-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"))))
 
-(defsubst w3m-resize-inline-image-internal (url rate)
+(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."
-  (interactive "P")
-  (let ((buffer-read-only)
-	start end iurl image size iscale scale)
-    (if (or (featurep 'xemacs)
-	    (>= emacs-major-version 21))
-	(progn
-	  (setq start (point)
-		end (or (next-single-property-change start 'w3m-image)
-			(point-max))
-		iurl (w3m-image start)))
-      ;; The case of using BITMAP-MULE:
-      ;; Look for the start and the end positions of the first line of
-      ;; a bitmap image.
-      (setq end (point-min)
-	    iurl "")
-      (while (and (not (string-equal url iurl))
-		  (setq start
-			(if (w3m-image end)
-			    end
-			  (next-single-property-change end 'w3m-image))))
-	(setq end (or (next-single-property-change start 'w3m-image)
-		      (point-max))
-	      iurl (w3m-image start)))
-      (goto-char start)
-      ;; Remove an existing bitmap image.
-      (let ((inhibit-read-only t))
-	(setq end (or (w3m-remove-image start end) end))))
-    (setq size (get-text-property start 'w3m-image-size)
-	  iscale (or (get-text-property start 'w3m-image-scale) '100))
+  (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))
@@ -3406,7 +4108,15 @@
 				   (progn (insert image) (point))
 				   '(w3m-image-dummy t
 						     w3m-image "dummy")))
-      (when iurl
+      (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))
@@ -3424,70 +4134,148 @@
 		(with-current-buffer (marker-buffer start)
 		  (if image
 		      (when (equal url w3m-current-url)
-			(let (buffer-read-only)
+			(let ((inhibit-read-only t))
 			  (w3m-static-when (featurep 'xemacs)
 			    (w3m-remove-image start end))
-			  (w3m-insert-image start end image iurl))
+			  (w3m-insert-image start end image iurl)
+			  (w3m-image-animate image))
 			;; Redisplay
 			(when w3m-force-redisplay
 			  (sit-for 0)))
-		    (let (buffer-read-only)
+		    (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-resize-image-interactive (image &optional rate changed-rate)
+  "Interactively resize IMAGE.
+If RATE is not given, use `w3m-resize-image-scale'.
+CHANGED-RATE is currently changed rate / 100."
+  (let ((char (w3m-static-if (featurep 'xemacs)
+		  (progn
+		    (message
+		     "Resize: [+ =] enlarge [-] shrink [0] original [q] quit")
+		    (read-char-exclusive))
+		(read-char-exclusive
+		 (propertize
+		  "Resize: [+ =] enlarge [-] shrink [0] original [q] quit"
+		  'face 'w3m-lnum-minibuffer-prompt))))
+	(changed-rate (or changed-rate 1)))
+    (w3m-static-if (featurep 'xemacs)
+	(setq char (char-octet char)))
+    (while (memq char '(?+ ?- ?= ?0))
+      (cond ((memq char '(?+ ?=))
+	     (let ((percent (+ 100 (or rate
+				       w3m-resize-image-scale))))
+	       (w3m-resize-inline-image-internal image percent)
+	       (setq changed-rate (* changed-rate
+				     (/ percent 100.0)))))
+	    ((eq char ?-)
+	     (let ((percent (- 100 (if rate
+				       (if (> rate 99) 99
+					 rate)
+				     w3m-resize-image-scale))))
+	       (w3m-resize-inline-image-internal image percent)
+	       (setq changed-rate (* changed-rate
+				     (/ percent 100.0)))))
+	    ((eq char ?0)
+	     (w3m-resize-inline-image-internal image
+					       (/ 100.0 changed-rate))
+	     (setq changed-rate 1)))
+      (setq char
+	    (w3m-static-if (featurep 'xemacs)
+		(progn
+		  (message
+		   "Resize: [+ =] enlarge [-] shrink [0] original [q] quit")
+		  (read-char-exclusive))
+	      (read-char-exclusive
+	       (propertize
+		"Resize: [+ =] enlarge [-] shrink [0] original [q] quit"
+		'face 'w3m-lnum-minibuffer-prompt))))
+      (w3m-static-if (featurep 'xemacs)
+	  (setq char (char-octet char))))))
+
 (defun w3m-zoom-in-image (&optional rate)
-  "Zoom in an image on the point."
+  "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)))
-    (unless rate
-      (setq rate w3m-resize-image-scale))
     (if url
-	(w3m-resize-inline-image-internal url (+ 100 rate))
+	(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."
+  "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)))
-    (unless rate
-      (setq rate w3m-resize-image-scale))
     (if url
-	(w3m-resize-inline-image-internal url (- 100 rate))
+	(w3m-resize-inline-image-internal
+	 url
+	 (- 100 (or rate w3m-resize-image-scale)))
       (w3m-message "No image at point"))))
 
-(defun w3m-decode-entities (&optional reserve-prop)
+(defun w3m-decode-entities (&optional keep-properties)
   "Decode entities in the current buffer.
-If optional RESERVE-PROP is non-nil, text property is reserved."
+If optional KEEP-PROPERTIES is non-nil, text property is reserved."
   (save-excursion
     (goto-char (point-min))
-    (let (start prop value)
+    ;; 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))
-	(if reserve-prop
-	    (setq prop (text-properties-at (match-beginning 0))))
-	;; 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)
-					    (match-beginning 2)))
-	  (replace-match value nil t))
-	(if (and reserve-prop prop)
-	    (w3m-add-text-properties start (point) prop))))))
+	(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
-    (with-temp-buffer
-      (insert str)
-      (w3m-decode-entities)
-      (buffer-string))))
+    ;; 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."
@@ -3496,7 +4284,7 @@
     (while (string-match "[<>&]" str pos)
       (setq buf
 	    (cons ";"
-		  (cons (car (rassoc (match-string 0 str) w3m-entity-alist))
+		  (cons (gethash (match-string 0 str) w3m-entity-reverse-table)
 			(cons "&"
 			      (cons (substring str pos (match-beginning 0))
 				    buf))))
@@ -3508,24 +4296,30 @@
 (defun w3m-fontify ()
   "Fontify the current buffer."
   (let ((case-fold-search t)
-	(buffer-read-only))
-    (run-hooks 'w3m-fontify-before-hook)
+	(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))))
+	  (delete-region start (match-end 0))
+	  (goto-char (point-min))))
     ;; Delete extra title tag.
-    (goto-char (point-min))
     (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))
@@ -3536,43 +4330,64 @@
     ;; Remove other markups.
     (goto-char (point-min))
     (while (re-search-forward "</?[A-Za-z_][^>]*>" nil t)
-      (let ((fid (get-text-property (match-beginning 0) 'w3m-form-field-id)))
-	(if (and fid (string-match "/type=textarea/" fid))
-	    (goto-char (match-end 0))
-	  (delete-region (match-beginning 0) (match-end 0)))))
+      (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)
+      (while (re-search-forward "^[ \t]*\n\\(?:[ \t]*\n\\)+" nil t)
 	(delete-region (match-beginning 0) (1- (match-end 0)))))
-    (w3m-message "Fontifying...done")
+
+    ;; 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 　")
+    (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-face' to
-`w3m-arrived-anchor-face'."
-  (save-excursion
-    (and buff (set-buffer buff))
-    (when (and (eq major-mode 'w3m-mode)
-	       (eq (get-text-property (point) 'face) 'w3m-anchor-face))
-      (let* ((start)
-	     (end (next-single-property-change (point) 'face))
-	     (buffer-read-only))
-	(when (and end
-		   (setq start (previous-single-property-change end 'face)))
-	  (w3m-add-text-properties start end '(face w3m-arrived-anchor-face)))
-	(set-buffer-modified-p nil)))))
+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 (string-match "\\`\\(?:file:\\|[/~]\\|\\.\\.?/\\|[a-zA-Z]:\\)" url)
       (if (eq flag 'lambda)
 	  (file-exists-p (w3m-url-to-file-name url))
 	(let* ((partial
@@ -3611,16 +4426,25 @@
 
 (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.  That it returns an
-invalid url if Gmane doesn't handle the group cannot be helped."
+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)
-	  md case-fold-search)
+	  case-fold-search)
       (goto-char (point-min))
-      (re-search-forward (concat "^\\("
+      (re-search-forward (concat "^\\(?:"
 				 (regexp-quote mail-header-separator)
 				 "\\)?$")
 			 nil 'move)
@@ -3632,156 +4456,232 @@
 	  (beginning-of-line)
 	  (while (and (memq (char-after) '(?\t ? ))
 		      (zerop (forward-line -1))))
-	  (when (or (looking-at "References:[\t\n ]*<\\([^\t\n <>]+\\)>")
-		    (prog1
-			(looking-at "Message-ID:[\t\n ]*<\\([^\t\n <>]+\\)>")
-		      (setq md (match-data))
-		      (goto-char (point-min))
-		      (unless (re-search-forward
-			       "^References:[\t\n ]*<\\([^\t\n <>]+\\)>"
-			       nil t)
-			(set-match-data md))))
+	  (when (looking-at
+		 "\\(?:Message-ID\\|References\\):[\t\n ]*<\\([^\t\n <>]+\\)>")
 	    (format
 	     fmt
-	     (w3m-url-encode-string (match-string-no-properties 1)))))))))
+	     (w3m-url-encode-string (match-string-no-properties 1)
+				    nil t))))))))
+
+(defun w3m-shr-url-at-point ()
+  "Return a url that shr.el provides at point."
+  (w3m-get-text-property-around 'shr-url))
+
+(defun w3m-header-line-url ()
+  "Return w3m-current-url if point stays at 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
-  (cond
-   ((locate-library "ffap")
-    (autoload 'ffap-url-at-point "ffap")
-    (if (featurep 'xemacs)
-	(if (featurep 'mule)
-	    (defun w3m-url-at-point ()
-	      "\
+  (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)
-		  (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)))))
-	  (defun w3m-url-at-point ()
-	    "\
+	     (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)
-		(unless (fboundp 'ffap-url-at-point)
-		  ;; It is necessary to bind `ffap-xemacs'.
-		  (load "ffap" nil t))
-		(let (ffap-xemacs)
-		  (ffap-url-at-point)))))
-      (defun w3m-url-at-point ()
-	(or (w3m-gmane-url-at-point)
-	    (ffap-url-at-point))))
-    (eval-after-load "ffap"
-      '(progn
-	 ;; Under Emacs 19, 20 or XEmacs, `ffap-url-regexp' won't match
-	 ;; to https urls by default.
-	 (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))))))
-   ((locate-library "thingatpt")
-    (autoload 'thing-at-point "thingatpt")
-    (defun w3m-url-at-point ()
-      "Return url from around point if it exists, or nil."
-      (or (w3m-gmane-url-at-point)
-	  (let ((url (thing-at-point 'url)))
-	    (when url
-	      (set-text-properties 0 (length url) nil url)
-	      url)))))
-   (t
-    (defalias 'w3m-url-at-point 'w3m-gmane-url-at-point))))
+	     (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-shr-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 ()
+(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."
+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
-	  (w3m-replace-in-string (buffer-substring-no-properties
-				  (region-beginning) (region-end))
-				 "[\t\r\f\n 　]+" "")
+	  (let ((string (buffer-substring-no-properties
+			 (region-beginning) (region-end))))
+	    (with-temp-buffer
+	      (insert string)
+	      (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))
+	      (while (re-search-forward "\
+\\(?:[\t\f\r 　]+\n[\t\f\r 　]*\\|[\t\f\r 　]*\n[\t\f\r 　]+\\)+" nil t)
+		(delete-region (match-beginning 0) (match-end 0)))
+	      (buffer-string)))
 	(w3m-deactivate-region))
-    (w3m-url-at-point)))
-
-(defsubst w3m-canonicalize-url (url)
-  "Add a scheme part to an URL if it has no scheme part."
-  (if (and (string-match w3m-url-components-regexp url)
-	   (match-beginning 1))
-      url
-    (concat (if (and (file-name-absolute-p url)
-		     (file-exists-p url))
-		"file://"
-	      "http://")
-	    url)))
+    (or (w3m-anchor)
+	(unless w3m-display-inline-images
+	  (w3m-image))
+	(w3m-url-at-point)
+	(and default=current
+	     (stringp w3m-current-url)
+	     (if (string-match "\\`about://\\(?:header\\|source\\)/"
+			       w3m-current-url)
+		 (substring w3m-current-url (match-end 0))
+	       (let ((name
+		      (or (car (get-text-property (point) 'w3m-name-anchor))
+			  (car (get-text-property (point) 'w3m-name-anchor2)))))
+		 (if name
+		     (concat w3m-current-url "#" name)
+		   w3m-current-url)))))))
+
+(defun w3m-canonicalize-url (url &optional feeling-lucky)
+  "Fix URL that does not look like a valid url.
+For URL having no scheme part, return a url that leaves it to chance if
+FEELING-LUCKY is non-nil (what is called \"I'm Feeling Lucky\" on Google).
+Also fix URL that fails to have put a separator following a domain name."
+  (if (string-match "\\`\\(https?://[-.0-9a-z]+\\)\\([#?].*\\)" url)
+      (concat (match-string 1 url) "/" (match-string 2 url))
+    (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
+      (concat "\
+http://www.google.com/search?btnI=I%%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="
+	      (w3m-url-encode-string url nil t)))
+     (t
+      (concat "http://" url)))))
 
-(defun w3m-input-url (&optional prompt initial default quick-start)
+(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)
-    (unless default
-      (setq default w3m-home-page))
-    (unless initial
-      (setq initial (w3m-active-region-or-url-at-point)))
+    (cond ((null initial)
+	   (when (setq initial (w3m-active-region-or-url-at-point t))
+	     (if (string-match "\\`about:" initial)
+		 (setq initial nil)
+	       (unless (string-match "[^\000-\177]" initial)
+		 (setq
+		  initial
+		  (w3m-url-decode-string initial
+					 (or (w3m-url-coding-system initial)
+					     w3m-current-coding-system)
+					 "%\\([2-9a-f][0-9a-f]\\)"))))))
+	  ((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 '(beginning-of-line))))
-		  (completing-read
-		   (or prompt
-		       (if default
-			   (format "URL (default %s): "
-				   (if (stringp default)
-				       (if (eq default w3m-home-page)
-					   "HOME" default)
-				     (prin1-to-string default)))
-			 "URL: "))
-		   'w3m-url-completion nil nil initial
-		   'w3m-input-url-history)))
-      (when (string= "" url)
-	(setq url default))
-      (if (stringp url)
-	  (progn
-	    ;; remove duplication
-	    (setq w3m-input-url-history
-		  (cons url (delete url w3m-input-url-history)))
-	    (w3m-canonicalize-url url))
-	;; It may be `popup'.
-	url))))
-
+		       (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 "
+					 (cond ((equal default "about:blank")
+						"BLANK")
+					       ((equal default w3m-home-page)
+						"HOME")
+					       (t default))
+					 "): "))
+			     prompt)
+			 (if default
+			     (format "URL %s(default %s): "
+				     (if feeling-lucky "or Keyword " "")
+				     (if (stringp default)
+					 (cond ((string= default "about:blank")
+						"BLANK")
+					       ((string= default w3m-home-page)
+						"HOME")
+					       (t 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))))
+      (unless (string-equal url "")
+	(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))
-    (save-excursion
-      (set-buffer (w3m-get-buffer-create " *w3m cache*"))
+    (with-current-buffer (w3m-get-buffer-create " *w3m cache*")
       (buffer-disable-undo)
       (set-buffer-multibyte nil)
       (setq buffer-read-only t
@@ -3795,11 +4695,14 @@
   (setq w3m-cache-hashtb nil
 	w3m-cache-articles nil))
 
-(defsubst w3m-cache-header-delete-variable-part (header)
-  (let (buf)
+(defun w3m-cache-header-delete-variable-part (header)
+  (let (buf flag)
     (dolist (line (split-string header "\n+"))
-      (unless (string-match "\\`\\(Date\\|Server\\|W3m-[^:]+\\):" line)
-	(push line buf)))
+      (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)
@@ -3807,6 +4710,7 @@
 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)
+  (setq url (w3m-w3m-canonicalize-url url))
   (let ((ident (intern url w3m-cache-hashtb)))
     (if (boundp ident)
 	(if (and
@@ -3822,17 +4726,16 @@
 (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)))
+  (let ((ident (intern (w3m-w3m-canonicalize-url url) w3m-cache-hashtb)))
     (and (boundp ident)
 	 (symbol-value ident))))
 
 (defun w3m-cache-remove-oldest ()
-  (save-excursion
-    (set-buffer w3m-cache-buffer)
+  (with-current-buffer w3m-cache-buffer
     (goto-char (point-min))
     (unless (zerop (buffer-size))
       (let ((ident (get-text-property (point) 'w3m-cache))
-	    buffer-read-only)
+	    (inhibit-read-only t))
 	;; Remove the ident from the list of articles.
 	(when ident
 	  (setq w3m-cache-articles (delq ident w3m-cache-articles)))
@@ -3848,9 +4751,8 @@
 	beg end)
     (when (memq ident w3m-cache-articles)
       ;; It was in the cache.
-      (save-excursion
-	(set-buffer w3m-cache-buffer)
-	(let (buffer-read-only)
+      (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).
@@ -3864,6 +4766,7 @@
 The contents are assumed to be in BUFFER.  Return a symbol which
 identifies the data in the cache."
   (w3m-cache-setup)
+  (setq url (w3m-w3m-canonicalize-url url))
   (let ((ident (intern url w3m-cache-hashtb)))
     (w3m-cache-remove url)
     ;; Remove the oldest article, if necessary.
@@ -3871,9 +4774,8 @@
 	 (>= (length w3m-cache-articles) w3m-keep-cache-size)
 	 (w3m-cache-remove-oldest))
     ;; Insert the new article.
-    (save-excursion
-      (set-buffer w3m-cache-buffer)
-      (let (buffer-read-only)
+    (with-current-buffer w3m-cache-buffer
+      (let ((inhibit-read-only t))
 	(goto-char (point-max))
 	(let ((b (point)))
 	  (insert-buffer-substring buffer)
@@ -3888,12 +4790,11 @@
 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)))
+  (let ((ident (intern (w3m-w3m-canonicalize-url url) w3m-cache-hashtb)))
     (when (memq ident w3m-cache-articles)
       ;; It was in the cache.
       (let (beg end)
-	(save-excursion
-	  (set-buffer w3m-cache-buffer)
+	(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).
@@ -3903,10 +4804,8 @@
 	    (setq w3m-cache-articles (delq ident w3m-cache-articles))))
 	(and beg
 	     end
-	     (save-excursion
-	       (when buffer
-		 (set-buffer buffer))
-	       (let (buffer-read-only)
+	     (with-current-buffer (or buffer (current-buffer))
+	       (let ((inhibit-read-only t))
 		 (insert-buffer-substring w3m-cache-buffer beg end))
 	       t))))))
 
@@ -3915,24 +4814,51 @@
   "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))))
-		   (and (string-match "^\\(Last-Modified\\|ETag\\):[ \t]" head)
-			(not (or (string-match "^Pragma:[ \t]+no-cache\n" head)
-				 (string-match
-				  "^Cache-control:[ \t]+\\(no-cache\\|max-age=0\\)\n"
-				  head)))))))
-	   ident))))
+    (let ((ident (intern (w3m-w3m-canonicalize-url 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 default
+    (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)))
@@ -3956,6 +4882,20 @@
   (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)
@@ -3986,8 +4926,6 @@
 	      (coding-system-for-read 'binary)
 	      (default-process-coding-system (cons 'binary 'binary)))
 	  (w3m-process-with-environment w3m-command-environment
-	    (w3m-static-if (featurep 'xemacs)
-		(goto-char (point-max)))
 	    (zerop (apply 'call-process-region
 			  (point-min) (point-max)
 			  (w3m-which-command (car x))
@@ -4007,51 +4945,88 @@
 			       (content :case-ignore))
 	  (when (and (string= http-equiv "content-type")
 		     content
-		     (string-match ";[ \t\n]*charset=\\([^\"]+\\)" 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))
-    (or (when (looking-at "[ \t\r\f\n]*<\\?xml[ \t\r\f\n]+")
-	  (goto-char (match-end 0))
-	  (w3m-parse-attributes ((encoding :case-ignore))
-	    encoding))
-	"utf-8")))
+    (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 (cs)
-    (unless content-type
-      (setq content-type (w3m-content-type url)))
-    (unless content-charset
-      (setq content-charset
-	    (or (w3m-content-charset url)
-		(when (string= "text/html" content-type)
-		  (w3m-detect-meta-charset))
-		(when (string-match
-		       "\\`\\(application\\|text\\)/\\([a-z]+\\+\\)?xml\\'"
-		       content-type)
-		  (w3m-detect-xml-charset)))))
-    (cond
-     ((and (eq w3m-type 'w3mmee)
-	   (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)
-    (setq w3m-current-coding-system
-	  (or cs
-	      (w3m-detect-coding-region
-	       (point-min) (point-max)
-	       (if (w3m-url-local-p url)
-		   nil
-		 w3m-coding-system-priority-list))))
-    (set-buffer-multibyte t)
-    (decode-coding-region (point-min) (point-max) w3m-current-coding-system)))
+  (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"))
@@ -4066,8 +5041,6 @@
 	    (append args (list "-o" "-cs" (symbol-name w3m-coding-system))))
       (setq charset w3m-coding-system))
     (w3m-process-with-environment w3m-command-environment
-      (w3m-static-if (featurep 'xemacs)
-	  (goto-char (point-max)))
       (apply 'call-process-region (point-min) (point-max)
 	     w3m-mbconv-command t t nil args))
     charset))
@@ -4083,8 +5056,9 @@
   "Return the content type and the content encoding of URL."
   (setq url (or (w3m-url-to-file-name url)
 		(file-name-nondirectory url)))
-  (if (and (file-name-absolute-p url)
-	   (file-directory-p 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
@@ -4125,7 +5099,7 @@
 	  (nth 5 attr)
 	  (w3m-expand-file-name-as-url (file-truename file)))))
 
-(defun w3m-local-retrieve (url &optional no-decode &rest args)
+(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."
@@ -4133,11 +5107,9 @@
     (when (file-readable-p file)
       (if (file-directory-p file)
 	  (w3m-local-dirlist-cgi url)
-	(let ((coding-system-for-read 'binary)
-	      (file-coding-system-for-read 'binary))
-	  (if no-decode
+	(let ((coding-system-for-read 'binary))
+	  (if no-uncompress
 	      (let (jka-compr-compression-info-list
-		    jam-zcat-filename-list
 		    format-alist)
 		(insert-file-contents file))
 	    (insert-file-contents file))))
@@ -4155,20 +5127,25 @@
 			  (format "%s.%d." (user-login-name) (emacs-pid))))
 		(cfile (make-temp-name
 			(expand-file-name "w3melck" w3m-profile-directory)))
-		file beg end)
+		(env (copy-sequence w3m-command-environment))
+		file)
 	    (with-temp-buffer
 	      (insert lcookie)
 	      (write-region (point-min) (point-max) cfile 'nomsg))
 	    (w3m-process-with-environment
-		(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)))
+		(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))
@@ -4176,17 +5153,14 @@
 	    (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)
+	      (while (re-search-forward "<a href=\"\\([^\"]+\\)\"\\(?:>\\| \\)"
+					nil t)
 		(setq file (match-string 1))
-		(setq beg (match-beginning 1))
-		(setq end (match-end 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)))
-		(delete-region beg end)
-		(goto-char beg)
 		(insert (encode-coding-string
 			 (w3m-url-decode-string file
 						w3m-file-name-coding-system)
@@ -4263,41 +5237,56 @@
 				   "last-modified"
 				   "location"
 				   "w3m-current-url"
+				   "w3m-document-charset"
 				   "w3m-ssl-certificate"
-				   "x-w3m-content-encoding"))
+				   "x-w3m-content-encoding"
+				   "alternates"))
 				"\\):[ \t]*"))
 		      line)
 	(push (cons (downcase (match-string 1 line))
 		    (substring line (match-end 0)))
 	      headers))))
-    (let (type charset)
-      (when (setq type (cdr (assoc "content-type" 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 (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
-	    (or type (w3m-local-content-type url))
-	    (or charset
-		(and (eq w3m-type 'w3mmee)
-		     (setq charset
-			   (cdr (assoc "w3m-document-charset" headers)))
-		     (car (split-string charset))))
+	    (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)
-		     (when (eq w3m-type 'w3mmee)
-		       (assoc "x-w3m-content-encoding" headers))))
+		     (assoc "x-w3m-content-encoding" headers)))
 	    (let ((v (cdr (assoc "last-modified" headers))))
 	      (and v (w3m-time-parse-string v)))
-	    (or (when (string-match "\\`ftps?:" url)
-		  (cdr (assoc "w3m-current-url" headers)))
+	    (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
@@ -4308,7 +5297,8 @@
 
 (defun w3m-w3m-dump-head (url handler)
   "Return the header string of URL."
-  (lexical-let ((url url))
+  (lexical-let ((url url)
+		(silent w3m-message-silent))
     (w3m-message "Request sent, waiting for response...")
     (w3m-process-do-with-temp-buffer
 	(success (progn
@@ -4319,17 +5309,18 @@
 				      (append w3m-command-arguments
 					      (list "-o" "follow_redirection=0"
 						    "-dump_head" url)))))
-      (w3m-message "Request sent, waiting for response...done")
-      (when success
-	(buffer-string)))))
+      (let ((w3m-message-silent silent))
+	(w3m-message "Request sent, waiting for response...done")
+	(when success
+	  (buffer-string))))))
 
-(defsubst w3m-w3m-canonicalize-url (url)
+(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)
+  (if (string-match "\\`\\(?:ht\\|f\\)tps?://[^/]+\\'" url)
       (concat url "/")
     url))
 
@@ -4362,24 +5353,15 @@
 		    (w3m-w3m-dump-head url handler)))
       (when header
 	(let ((attr (w3m-w3m-parse-header url header)))
-	  (if (string-match "\\`ftps?:" url)
-	      (progn
-		(setq url (nth 6 attr))
-		(if (string-match "/\\'" url)
-		    (list "text/html"
-			  (if w3m-accept-japanese-characters
-			      "w3m-euc-japan" "w3m-iso-latin-1")
-			  nil nil nil url)
-		  (list (w3m-local-content-type url) nil nil nil nil url)))
-	    (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'.
-		    nil
-		  ;; Follow redirection.
-		  (w3m-w3m-attributes-1 (nth 6 attr) no-cache
-					(1- counter) handler))
-	      (cdr attr))))))))
+	  (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
@@ -4399,7 +5381,8 @@
 
 (defun w3m-w3m-dump-extra (url handler)
   "Retrive headers and contents pointed to by URL"
-  (lexical-let ((url 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"
@@ -4416,36 +5399,22 @@
 				    (w3m-w3m-expand-arguments
 				     w3m-dump-head-source-command-arguments)
 				    (list url))))
-      (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)))
-	    ;; Asahi-shimbun sometimes says gif as jpeg mistakenly, for
-	    ;; example.  So, we cannot help trusting the data itself.
-	    (when (prog2
-		      (setq case-fold-search nil)
-		      (looking-at "\\(GIF8\\)\\|\\(\377\330\\)\\|\211PNG\r\n")
-		    (setq case-fold-search t))
-	      (let ((type (cond ((match-beginning 1) "gif")
-				((match-beginning 2) "jpeg")
-				(t "png"))))
-		(save-excursion
-		  (when (re-search-backward "^content-type: image/\\(.+\\)$"
-					    nil t)
-		    (delete-region (goto-char (match-beginning 1))
-				   (match-end 1))
-		    (insert type)))))
-	    (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))))))))
+      (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.
@@ -4466,7 +5435,7 @@
 	       (catch 'domain-match
 		 (setq host (match-string 1 url))
 		 (dolist (domain w3m-no-proxy-domains)
-		   (when (string-match (concat "\\(^\\|\\.\\)"
+		   (when (string-match (concat "\\(?:^\\|\\.\\)"
 					       (regexp-quote domain)
 					       "$")
 				       host)
@@ -4481,11 +5450,11 @@
     (cond
      ((eq w3m-add-referer 'lambda)
       (let (host)
-	(when (and (string-match w3m-url-components-regexp url)
-		   (match-beginning 4))
+	(w3m-string-match-url-components url)
+	(when (match-beginning 4)
 	  (setq host (match-string 4 url))
-	  (when (and (string-match w3m-url-components-regexp referer)
-		     (match-beginning 4))
+	  (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)
@@ -4576,28 +5545,38 @@
       (setq args (nconc args (list "-header" (concat "Referer: " referer)))))
     args))
 
-(defun w3m-w3m-retrieve (url no-decode no-cache post-data referer handler)
+(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-decode no-decode)
-		(current-buffer (current-buffer)))
+		(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)))
-      (when (memq (car attr) '(200 300))
-	(if (or no-decode
-		(w3m-decode-encoded-contents (nth 4 attr)))
-	    (let ((temp-buffer (current-buffer)))
-	      (with-current-buffer current-buffer
-		(insert-buffer-substring temp-buffer))
-	      (cadr attr))
-	  (ding)
-	  (w3m-message "Can't decode encoded contents: %s" url)
-	  nil)))))
+      (setq w3m-http-status (car-safe attr))
+      (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'."
@@ -4607,11 +5586,12 @@
 		   (list "-no-cookie"))
 		 (list "-o" "follow_redirection=0")
 		 (w3m-additional-command-arguments url)))
-	(temp-file))
-    (and no-cache
-	 w3m-broken-proxy-cache
-	 (setq w3m-command-arguments
-	       (append w3m-command-arguments '("-o" "no_cache=1"))))
+	(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
@@ -4637,7 +5617,7 @@
 		  (temp-file temp-file))
       (w3m-process-do
 	  (attr (or (unless no-cache
-		      (and (w3m-cache-available-p url)
+		      (and cachep
 			   (w3m-cache-request-contents url)
 			   (w3m-w3m-parse-header
 			    url (w3m-cache-request-header url))))
@@ -4648,7 +5628,7 @@
 	(if (memq (car attr) '(301 302 303 304 305 306 307))
 	    (if (zerop counter)
 		;; Redirect counter exceeds `w3m-follow-redirection'.
-		nil
+		'redirection-exceeded
 	      ;; Follow redirection.
 	      (erase-buffer)
 	      (unless (and post-data
@@ -4666,36 +5646,40 @@
 		(w3m-w3m-retrieve-1 (nth 6 attr)
 				    post-data referer no-cache
 				    (1- counter) handler)))
-	  attr)))))
+	  (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-decode no-cache
+(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)
-    (when (or (fboundp 'base64-decode-string)
-	      (condition-case nil
-		  ;; Emacs 19 doesn't provide the internal base64 functions.
-		  (require 'base64)
-		(error
-		 (message "You need to install the base64.el(c) module")
-		 nil)))
-      (let* ((b64d 'base64-decode-string)
-	     ;; Avoid compile warning under old Emacsen.
-	     (icon (funcall b64d w3m-emacs-w3m-icon)))
-	(if (featurep 'xemacs)
-	    (insert icon)
-	  (set-buffer-multibyte (multibyte-string-p icon))
+    (let ((icon (base64-decode-string w3m-emacs-w3m-icon)))
+      (if (featurep 'xemacs)
 	  (insert icon)
-	  (set-buffer-multibyte nil)))
-      "image/gif"))
+	(set-buffer-multibyte (multibyte-string-p icon))
+	(insert icon)
+	(set-buffer-multibyte nil)))
+    "image/gif")
    ((string-match "\\`about://source/" url)
-    (w3m-process-do
-	(type (w3m-retrieve (substring url (match-end 0))
-			    no-decode no-cache post-data referer handler))
-      (when type "text/plain")))
+    (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
@@ -4709,9 +5693,9 @@
 				 (intern-soft (concat "w3m-about-"
 						      (match-string 1 url))))
 			   (fboundp func))
-		      (funcall func url no-decode no-cache
+		      (funcall func url no-uncompress no-cache
 			       post-data referer handler)
-		    (w3m-about url no-decode no-cache))))
+		    (w3m-about url no-uncompress no-cache))))
 	(when type
 	  (when (string-match "\\`text/" type)
 	    (encode-coding-region (point-min) (point-max) w3m-coding-system))
@@ -4722,7 +5706,7 @@
 		(insert-buffer-substring temp-buffer))))
 	  type))))))
 
-(defun w3m-cid-retrieve (url &optional no-decode no-cache)
+(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
@@ -4737,15 +5721,54 @@
 \(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-DECODE
-specifies whether functions should not decode extracted contents;
+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-decode no-cache))))
+    (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
+		   (w3m-url-decode-string data-string 'us-ascii)))
+		 (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-decode no-cache
+(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.
@@ -4763,14 +5786,15 @@
 content type of the retrieved data will be passed to HANDLER as a
 string argument.
 
-NO-DECODE specifies whether this function should not decode contents.
+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."
+  (set (make-local-variable 'w3m-http-status) nil)
   (if (not handler)
       (condition-case nil
 	  (w3m-process-with-wait-handler
 	    (w3m-retrieve url
-			  no-decode no-cache post-data referer handler))
+			  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)))
@@ -4779,14 +5803,16 @@
       (cond
        ((string-match "\\`about:" url)
 	(w3m-about-retrieve url
-			    no-decode no-cache post-data referer handler))
+			    no-uncompress no-cache post-data referer handler))
        ((string-match "\\`cid:" url)
-	(w3m-cid-retrieve url no-decode no-cache))
+	(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-decode))
+	(w3m-local-retrieve url no-uncompress))
        (t
 	(w3m-w3m-retrieve url
-			  no-decode no-cache post-data referer handler))))))
+			  no-uncompress no-cache post-data referer handler))))))
 
 (defvar w3m-touch-file-available-p 'undecided)
 
@@ -4842,55 +5868,55 @@
 				  file)))))))
 
 ;;;###autoload
-(defun w3m-download (url &optional filename no-cache handler)
-  (interactive
-   (let* ((url (w3m-input-url "Download URL (default HOME): "
-			      (when (stringp w3m-current-url)
-				(if (string-match
-				     "\\`about://\\(header\\|source\\)/"
-				     w3m-current-url)
-				    (substring w3m-current-url (match-end 0))
-				  w3m-current-url))
-			      w3m-home-page))
-	  (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))))
+(defun w3m-download (&optional url 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 (list nil nil current-prefix-arg))
+  (unless url
+    (setq url (w3m-input-url "Download URL: ")))
+  (unless filename
+    (let ((basename (file-name-nondirectory (w3m-url-strip-query url))))
+      (when (string-match "^[\t ]*$" basename)
+	(when (string-match "^[\t ]*$"
+			    (setq basename (file-name-nondirectory url)))
+	  (setq basename "index.html")))
+      (setq filename
+	    (w3m-read-file-name (format "Download %s to: " url)
+				w3m-default-save-directory basename))))
   (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))))
+		  (filename filename)
+		  (page-buffer (current-buffer)))
       (w3m-process-do-with-temp-buffer
 	  (type (progn
 		  (w3m-clear-local-variables)
 		  (setq w3m-current-url url)
-		  (w3m-retrieve url t no-cache nil nil handler)))
+		  (w3m-retrieve url t no-cache post-data nil handler)))
 	(if type
 	    (let ((buffer-file-coding-system 'binary)
-		  (file-coding-system 'binary)
 		  (coding-system-for-write 'binary)
 		  jka-compr-compression-info-list
-		  jam-zcat-filename-list
 		  format-alist)
 	      (when (or (not (file-exists-p filename))
-			(y-or-n-p
-			 (format "File(%s) already exists. Overwrite? "
-				 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)
-		     ""))
+	  (with-current-buffer page-buffer
+	    (message "Cannot retrieve URL: %s%s" url
+		     (cond ((and w3m-process-exit-status
+				 (not (equal w3m-process-exit-status 0)))
+			    (format " (exit status: %s)"
+				    w3m-process-exit-status))
+			   (w3m-http-status
+			    (format " (http status: %s)" w3m-http-status))
+			   (t ""))))
 	  nil)))))
 
 ;;; Retrieve data:
@@ -4917,12 +5943,30 @@
       (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)
+    (when (re-search-forward "</head\\(?:[ \t\r\f\n][^>]*\\)?>" nil t)
       (save-restriction
 	(narrow-to-region (point-min) (point))
 	(goto-char (point-min))
@@ -4969,6 +6013,9 @@
 		(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)
@@ -4988,6 +6035,28 @@
 	      (delete-region start (point))
 	      (throw 'found nil))))))))
 
+(defun w3m-fix-illegal-blocks ()
+  "Replace <div>...</div> within <a>...</a> with <span>...<br></span>.
+<div> is a block element that should not appear within inline elements
+like <a>, however some web sites, e.g., news.google.com.tw, do so and
+w3m regards it as an incomplete <a> tag that is not closed."
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (while (re-search-forward "<a[\t\n ]" nil t)
+      (save-restriction
+	(narrow-to-region (match-beginning 0)
+			  (or (w3m-end-of-tag "a") (point-max)))
+	(goto-char (point-min))
+	(while (re-search-forward "<div[\t\n >]" nil t)
+	  (when (w3m-end-of-tag "div")
+	    (replace-match (concat "<span" (substring (buffer-substring
+						       (match-beginning 0)
+						       (match-end 1)) 4)
+				   "<br></span>")
+			   t t)
+	    (goto-char (match-beginning 0))))
+	(goto-char (point-max))))))
+
 (defun w3m-rendering-extract-title ()
   "Extract the title from the halfdump and put it into the current buffer."
   (goto-char (point-min))
@@ -5003,9 +6072,34 @@
 	(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
@@ -5013,13 +6107,6 @@
 	 (default-process-coding-system
 	   (cons coding-system-for-read coding-system-for-write)))
     (w3m-process-with-environment w3m-command-environment
-      ;; `call-process-region' provided by XEmacs of versions 21.5.7
-      ;; through 21.5.17 is evil.  It requires the point to have to be
-      ;; in the beginning or the end of the region when the 4th arg is t.
-      ;; The problem has been reported with an example as:
-      ;; <URL:http://list-archive.xemacs.org/xemacs-beta/200311/msg00253.html>
-      (w3m-static-if (featurep 'xemacs)
-	  (goto-char (point-max)))
       (apply 'call-process-region
 	     (point-min)
 	     (point-max)
@@ -5055,14 +6142,26 @@
   "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-fix-illegal-blocks)
   (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.
@@ -5071,89 +6170,152 @@
 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
-	       (not (string-match "\\`\\(ht\\|f\\)tps://" url))
-	       (not (y-or-n-p "You are leaving secure page.  Continue? ")))
+	       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)))
+		  (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)))
-	(when (buffer-live-p page-buffer)
-	  (setq url (w3m-url-strip-authinfo url))
-	  (if type
-	      (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)
-		  (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)
-			     "")))))))))
+	(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 1e-9)
+		      (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))
+		(with-current-buffer page-buffer
+		  (w3m-message
+		   "Cannot retrieve URL: %s%s" url
+		   (cond ((and w3m-process-exit-status
+			       (not (equal w3m-process-exit-status 0)))
+			  (format " (exit status: %s)"
+				  w3m-process-exit-status))
+			 (w3m-http-status
+			  (format " (http status: %s)" w3m-http-status))
+			 (t ""))))))))))))
 
 (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)
-	      (insert
-	       errmsg
-	       (format "<br><br><b>%s</b> could not be found."
-		       (w3m-get-server-hostname url))
-	       " Please check the name, and try again."))
+  (let ((case-fold-search t)
+	(header (w3m-cache-request-header url))
+	exit-status http-status errmsg)
+    (with-current-buffer page-buffer
+      (setq exit-status w3m-process-exit-status
+	    http-status w3m-http-status))
+    (setq errmsg
+	  (concat
+	   "<br><h1>Cannot retrieve URL: <a href=\""
+	   url "\">" url "</a></h1>\n"
+	   (cond
+	    ((and exit-status (not (equal exit-status 0)))
+	     (format "<br><br><h2>%s exits with the code %s</h2>\n"
+		     w3m-command exit-status))
+	    (http-status
+	     (format "<br><br><h2>%s %s</h2>\n"
+		     http-status
+		     (or (cdr (assq http-status w3m-http-status-alist))
+			 ""))))))
+    (if (or (null header)
+	    (string-match "\\`w3m: Can't load " header))
+	(progn
+	  (insert errmsg)
+	  (unless http-status
+	    (insert "\
+<br><br>Something seems to be wrong with URL or this system.\n")
+	    (when (string-match "\\`news:" url)
+	      (insert "\
+<br>Also verify the value of the <b>NNTPSERVER</b> environment variable\
+ that should be the address of the <b>NNTP</b> server.\n")))
+	  (save-restriction
+	    (narrow-to-region (point) (point))
+	    (when (w3m-cache-request-contents url)
+	      (w3m-decode-encoded-contents
+	       (setq charset (w3m-content-encoding url)))
+	      (goto-char (point-min))
+	      (insert "<br><br><hr><br>\n<h2>Contents</h2><br>\n"))))
+      (goto-char (point-min))
+      (or (search-forward "<body>" nil t)
+	  (search-forward "<html>" nil t))
+      (unless (bolp) (insert "\n"))
+      (insert errmsg)
+      (save-restriction
+	(narrow-to-region (point) (point))
+	(when (w3m-cache-request-contents url)
+	  (w3m-decode-encoded-contents
+	   (setq charset (w3m-content-encoding url)))
 	  (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"))))
+	  (insert "<br><br><hr><br>\n")
+	  (goto-char (point-max))))
+      (unless (eobp) (insert "<br><br><hr><br>\n"))
+      (when header
+	(or (search-forward "</body>" nil t)
+	    (search-forward "</html>" nil 'max))
+	(unless (bolp) (insert "\n"))
+	(insert "<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
@@ -5170,59 +6332,127 @@
      ; 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 (w3m-real-url url)
+  (setq w3m-current-url (if (w3m-arrived-p url)
+			    (w3m-real-url url)
+			  url)
 	w3m-current-title
 	(if (string= "text/html" type)
-	    (setf (w3m-arrived-title url)
-		  (w3m-rendering-buffer charset))
-	  (or (when (string-match "\\`about://\\(source\\|header\\)/" url)
+	    (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 (buffer-read-only)
+      (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 (buffer-read-only)
+      (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 'face 'w3m-image-face
-				       'w3m-image url
+				 (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)))
+    (let ((cur (current-buffer))
+	  (mb enable-multibyte-characters)
+	  dots cont)
+      (with-temp-buffer
+	(rename-buffer " *Raw Contents*" t)
+	(set-buffer-multibyte mb)
+	(save-window-excursion
+	  (pop-to-buffer (current-buffer))
+	  (delete-other-windows)
+	  (ding)
+
+	  ;; Display the raw contents briefly.
+	  (sit-for 0)
+	  (setq truncate-lines t
+		dots (make-string (/ (- (window-width) 6) 2) ?.))
+	  (with-current-buffer cur
+	    (cond ((< (count-lines (point-min) (point-max)) (window-height))
+		   (setq cont (buffer-string)))
+		  ((< (window-height) 10)
+		   (goto-char (point-min))
+		   (forward-line (max 0 (- (window-height) 2)))
+		   (setq cont
+			 (concat
+			  (buffer-substring (point-min) (point))
+			  "\n[" dots "snip" dots "]")))
+		  (t
+		   (goto-char (point-min))
+		   (forward-line (/ (- (window-height) 4) 2))
+		   (setq cont (concat (buffer-substring (point-min) (point))
+				      "\n[" dots "snip" dots "]\n\n"))
+		   (goto-char (point-max))
+		   (forward-line (/ (- 4 (window-height)) 2))
+		   (setq cont (concat
+			       cont
+			       (buffer-substring (point) (point-max)))))))
+	  (insert cont)
+	  (goto-char (point-min))
+
+	  (setq type
+		(condition-case nil
+		    (completing-read
+		     (format
+		      "%s's content type (default Download or External-View): "
+		      (file-name-nondirectory url))
+		     w3m-content-type-alist nil t)
+		  ;; The user forced terminating the session with C-g.
+		  (quit
+		   (w3m-process-stop page-buffer) ;; Needless?
+		   (with-current-buffer page-buffer
+		     (setq w3m-current-process nil))
+		   (keyboard-quit))))
+	  (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)
@@ -5235,8 +6465,17 @@
     (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)
+    (with-current-buffer page-buffer
+      (setq w3m-current-url (if (w3m-arrived-p url)
+				(w3m-real-url url)
+			      url)))
+    (w3m-doc-view url))
    (t
     (with-current-buffer page-buffer
+      (setq w3m-current-url (if (w3m-arrived-p url)
+				(w3m-real-url url)
+			      url))
       (w3m-external-view url)
       'external-view))))
 
@@ -5274,6 +6513,67 @@
      (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]+\\)\\\">前へ</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]+\\)\\\">次へ</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+]\\)\")'>前へ</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+]\\)\")'>次へ</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."
@@ -5281,85 +6581,118 @@
   (and next
        (re-search-forward next nil t)
        (setq w3m-next-url
-	     (w3m-expand-url (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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)
+(defun w3m-search-name-anchor (name &optional quiet no-record)
   (interactive "sName: ")
-  (let ((pos (point-min)))
+  (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 t)))
+	  (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 t)))
+	  (throw 'found (setq found t))))
       (unless quiet
-	(message "No such anchor: %s" name))
-      nil)))
+	(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))))
+      (string-match "\\`[a-z]+://?[^/]+/." w3m-current-url))))
 
-(defun w3m-view-parent-page ()
+(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/\" if you are currently
-viewing \"http://foo/bar/\"."
-  (interactive)
-  (if (null w3m-current-url)
-      (error "w3m-current-url is not set"))
-  (let (parent-url)
-    ;; Check whether http://foo/bar/ or http://foo/bar
-    (if (string-match "/$" w3m-current-url)
-	(if (string-match "\\(.*\\)/[^/]+/$" w3m-current-url)
-	    ;; http://foo/bar/ -> http://foo/
-	    (setq parent-url (concat (match-string 1 w3m-current-url) "/")))
-      (if (string-match "\\(.*\\)/.+$" w3m-current-url)
-	  ;; http://foo/bar -> http://foo/
-	  (setq parent-url (concat (match-string 1 w3m-current-url) "/"))))
-    ;; Ignore "http:/"
-    (if (and parent-url
-	     (string-match "^[a-z]+:/+$" parent-url))
-	(setq parent-url nil))
-    (if parent-url
-	(w3m-goto-url parent-url)
-      (error "No parent page for: %s" w3m-current-url))))
+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))
+  (w3m-history-store-position)
+  (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.
@@ -5374,25 +6707,41 @@
 	(when (> count 0)
 	  (decf count))
       (setq count 0)))
-  (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 nil))
-    (if hist
-	(let ((w3m-prefer-cache t))
-	  (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))
+  (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))
-      (message "There's no more history"))))
+      (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 (caar 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.
@@ -5402,30 +6751,32 @@
   (interactive "p")
   (w3m-view-previous-page (if (integerp count) (- count) -1)))
 
-(eval-and-compile
-  (unless (fboundp 'w3m-expand-path-name)
-    (if w3m-treat-drive-letter
-	;; Avoid incompatibility of drive letters.
-	(defun w3m-expand-path-name (name &optional base)
-	  "Convert path string NAME to the canonicalized one."
-	  ;; cygwin-mount.el destroys `expand-file-name';
-	  ;; (expand-file-name "../index.html" "/foo/bar/")
-	  ;;  => "c:/cygwin/foo/index.html"
-	  (let ((inhibit-file-name-handlers
-		 '(cygwin-mount-name-hook-function
-		   cygwin-mount-map-drive-hook-function))
-		(inhibit-file-name-operation 'expand-file-name)
-		path)
-	    (setq path
-		  (w3m-static-if (featurep 'xemacs)
-		      ;; It is ?\ by default in XEmacs on Windows native.
-		      (let ((directory-sep-char ?/))
-			(expand-file-name name base))
-		    (expand-file-name name base)))
-	    (if (string-match "\\`.:" path)
-		(substring path (match-end 0))
-	      path)))
-      (defalias 'w3m-expand-path-name 'expand-file-name))))
+(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")
@@ -5433,14 +6784,21 @@
 This list is refered to by `w3m-expand-url' to keep backward
 compatibility which is described in Section 5.2 of RFC 2396.")
 
+(defconst w3m-buffer-local-url "buffer://")
+(defun w3m-buffer-local-url-p (url)
+  (save-match-data
+    (string-match (concat "^" w3m-buffer-local-url) url)))
+
 (defun w3m-expand-url (url &optional base)
   "Convert URL to the absolute address, and canonicalize it."
   (save-match-data
     (if base
-	(if (and (string-match w3m-url-components-regexp base)
-		 (match-beginning 1))
+	(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)
+		 (member (downcase (match-string 2 base))
+			 w3m-url-hierarchical-schemes)
 		 (setq base (concat
 			     (substring base 0 (match-end 1))
 			     "//"
@@ -5449,17 +6807,23 @@
       (setq base (or w3m-current-base-url
 		     w3m-current-url
 		     w3m-url-fallback-base)))
-    (string-match w3m-url-components-regexp url)
+    (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)))
-      (string-match w3m-url-components-regexp url))
+      (w3m-string-match-url-components url))
     ;; Remove an empty query part.
     (when (and (match-beginning 6)
-	       (= (match-beginning 7) (length url)))
-      (setq url (substring url 0 (match-beginning 6)))
-      (string-match w3m-url-components-regexp url))
+	       (= (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.
@@ -5470,48 +6834,47 @@
 	  ;; part. => URL has an absolute spec.
 	  url
 	(let ((scheme (match-string 2 url)))
-	  (if (and (member scheme w3m-url-hierarchical-schemes)
-		   (string-match w3m-url-components-regexp base)
-		   (equal scheme (match-string 2 base)))
+	  (if (and (member (downcase 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.
-      (string-match w3m-url-components-regexp base)
+      (w3m-string-match-url-components base)
       (concat (substring base 0 (match-end 1)) url))
      ((> (match-end 5) (match-beginning 5))
-      ;; URL has a hierarchical part.
-      (if (eq ?/ (aref url (match-beginning 5)))
-	  ;; Its first character is the slash "/". => The hierarchical
-	  ;; part of URL has an absolute spec.
-	  (progn
-	    (string-match w3m-url-components-regexp base)
-	    (concat (substring base 0 (or (match-end 3) (match-end 1)))
-		    url))
-	;; The hierarchical part of URL has a relative spec.
-	(let ((path-end (match-end 5))
-	      ;; 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)
-	  (string-match w3m-url-components-regexp base)
+      (let ((path-end (match-end 5)))
+	(if (string-equal base w3m-buffer-local-url)
+	    (if (eq (aref url 0) ?#)
+		(concat base url)
+	      ;; Assume url omits the scheme, that is http.
+	      (concat "http://" url))
+	  (w3m-string-match-url-components base)
 	  (concat
 	   (substring base 0 (match-beginning 5))
-	   (if (member (match-string 2 base) w3m-url-hierarchical-schemes)
+	   (if (and (match-beginning 2)
+		    (member (downcase (match-string 2 base))
+			    w3m-url-hierarchical-schemes))
 	       (w3m-expand-path-name
 		(substring url 0 path-end)
-		(file-name-directory (match-string 5 base)))
+		(or
+		 ;; Avoid file name handlers; cf.
+		 ;; http://news.gmane.org/group/gmane.emacs.w3m/thread=4210
+		 (let (file-name-handler-alist)
+		   (file-name-directory (match-string 5 base)))
+		 "/"))
 	     (substring url 0 path-end))
 	   (substring url path-end)))))
      ((match-beginning 6)
       ;; URL has a query part.
-      (string-match w3m-url-components-regexp base)
-      (concat (file-name-directory (substring base 0 (match-end 5)))
-	      url))
+      (w3m-string-match-url-components base)
+      (concat (substring base 0 (match-end 5)) url))
      (t
       ;; URL has only a fragment part.
-      (string-match w3m-url-components-regexp base)
+      (w3m-string-match-url-components base)
       (concat (substring base 0 (match-beginning 8))
 	      url)))))
 
@@ -5527,59 +6890,49 @@
   (put-text-property (point) (point-max) 'w3m-progress-message t)
   (sit-for 0))
 
-(defsubst w3m-view-this-url-1 (url reload new-session)
-  (lexical-let (pos buffer newbuffer wconfig)
+(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 settion, otherwise
+	       ;; the buffer's contents to the new session, otherwise
 	       ;; creating an empty buffer.
-	       (not (and (string-match w3m-url-components-regexp url)
-			 (match-beginning 8)
+	       (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 w3m-view-this-url-new-session-in-background
-			empty))
-	  (when w3m-view-this-url-new-session-in-background
+			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
-	   (save-window-excursion
-	     (prog1
-		 (w3m-goto-url url reload nil nil w3m-current-url handler)
-	       (setq newbuffer (current-buffer)
-		     wconfig (current-window-configuration)))))
-	;; When 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, etc.), we need to make the new buffer visible.
-	(when (and (eq (with-current-buffer buffer major-mode)
-		       'w3m-mode)
-		   (not (eq (with-current-buffer newbuffer major-mode)
-			    'w3m-mode)))
-	  ;; Empty buffer must delete before restore window configuration.
-	  (when pos
-	    (w3m-delete-buffer-if-empty buffer))
-	  (set-window-configuration wconfig))
-	;; The new session is created.
-	(when pos
-	  ;; Already empty buffer killed if the new url is not the w3m-mode.
-	  (when (buffer-name buffer)
-	    (w3m-delete-buffer-if-empty buffer))
+	  (success (w3m-goto-url url reload nil nil w3m-current-url handler
+				 nil w3m-new-session-in-background))
+	(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 (buffer-name (marker-buffer pos))
-	    (save-excursion
-	      (set-buffer (marker-buffer pos))
+	  (when (and (marker-buffer pos) (buffer-name (marker-buffer pos)))
+	    (with-current-buffer (marker-buffer pos)
 	      (save-excursion
 		(goto-char pos)
-		(w3m-refontify-anchor)))))))))
+		(w3m-refontify-anchor)))))
+	(w3m-recenter)))))
 
 (defun w3m-view-this-url (&optional arg new-session)
   "Display the page pointed to by the link under point.
@@ -5591,21 +6944,28 @@
   (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
-	     (string-match "\\`about://\\(db-\\)?history/" w3m-current-url)))
+	     (and (stringp w3m-current-url)
+		  (string-match "\\`about://\\(?:db-\\)?history/"
+				w3m-current-url))))
 	act url)
     (cond
      ((setq act (w3m-action))
-      (eval act))
+      (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))
-      (unless (eq 'quit (setq url (w3m-input-url nil url 'quit)))
+     ((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")))))
 
@@ -5635,10 +6995,11 @@
       (setq urls (list url)))
     (save-excursion
       (goto-char start)
-      (setq all (not (and (bolp)
-			  w3m-current-url
-			  (string-match "\\`http://\\([^/]+\\.\\)*google\\."
-					w3m-current-url))))
+      (setq all (not
+		 (and (bolp)
+		      w3m-current-url
+		      (string-match "\\`https?://\\(?:[^/]+\\.\\)*google\\."
+				    w3m-current-url))))
       (while (progn
 	       (w3m-next-anchor)
 	       (and (> (point) prev)
@@ -5649,6 +7010,7 @@
 		   (or all
 		       (bolp)))
 	  (push url urls))))
+    (setq urls (nreverse urls))
     (while urls
       (setq url (car urls)
 	    urls (cdr urls))
@@ -5670,14 +7032,19 @@
   (mouse-set-point event)
   (w3m-view-this-url nil t))
 
-(defun w3m-submit-form ()
+(defun w3m-submit-form (&optional new-session)
   "Submit the form at point."
-  (interactive)
+  (interactive "P")
   (let ((submit (w3m-submit)))
     (if (and submit
 	     w3m-current-url
-	     (w3m-url-valid w3m-current-url))
-	(eval submit)
+	     (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)
@@ -5687,7 +7054,14 @@
       (w3m-process-do
 	  (type (w3m-content-type url no-cache handler))
 	(when type
-	  (lexical-let ((method (nth 2 (assoc type w3m-content-type-alist))))
+	  (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))))
+			(default
+			  (nth 2 (assoc "text/html" w3m-content-type-alist))))
+	    (when (and (not method) default)
+	      (setq method default))
 	    (cond
 	     ((not method)
 	      (if (w3m-url-local-p url)
@@ -5740,13 +7114,14 @@
 	    (set-process-sentinel
 	     proc
 	     (lambda (proc event)
-	       (and (string-match "^\\(finished\\|exited\\)" event)
-		    (buffer-name (process-buffer proc))
-		    (with-current-buffer (process-buffer proc)
-		      (and (stringp file)
-			   (file-exists-p file)
-			   (delete-file file)))
-		    (kill-buffer (process-buffer proc))))))
+	       (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)
@@ -5772,61 +7147,156 @@
 	(w3m-download url)
       (w3m-message "No image at point"))))
 
-(defun w3m-view-url-with-external-browser ()
+(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)
-  (let ((url (or (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"))))
+  (interactive (list (w3m-input-url "URL to view externally: "
+				    (or (w3m-anchor)
+					(unless w3m-display-inline-images
+					  (w3m-image))
+					w3m-current-url)
+				    "")))
+  (when (w3m-url-valid url)
+    (message "Browsing <%s>..." url)
+    (w3m-external-view url)))
 
 (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))))
-    (if (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))
-		   (save-excursion
-		     (set-buffer (marker-buffer pos))
-		     (when (equal curl w3m-current-url)
-		       (goto-char pos)
-		       (w3m-refontify-anchor)))))))
-      (w3m-message "No URL at point"))))
+  (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
-    (kill-new w3m-current-url)
-    (w3m-message "%s" (w3m-url-readable-string w3m-current-url))))
+    (let ((deactivate-mark nil))
+      (kill-new (w3m-url-encode-string-2 w3m-current-url))
+      (w3m-message "%s" (w3m-url-readable-string w3m-current-url)))))
+
+(defvar message-truncate-lines)
 
 (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 ((url (if interactive-p
-		 (or (w3m-anchor) (w3m-image))
-	       (or (w3m-anchor (point)) (w3m-image (point))))))
+  (let ((deactivate-mark nil)
+	(url (if interactive-p
+		 (or (w3m-anchor)
+		     (w3m-image)
+		     (and (stringp w3m-current-url)
+			  (let ((name (or (car (get-text-property
+						(point) 'w3m-name-anchor))
+					  (car (get-text-property
+						(point)
+						'w3m-name-anchor2)))))
+			    (when name
+			      (concat w3m-current-url "#" name)))))
+	       (or (w3m-anchor (point)) (w3m-image (point)))))
+	(alt (if interactive-p
+		 (w3m-image-alt)
+	       (w3m-image-alt (point))))
+	(title (if interactive-p
+		   (w3m-anchor-title)
+		 (w3m-anchor-title (point)))))
+    (when (or url interactive-p)
+      (and url interactive-p (kill-new (w3m-url-encode-string-2 url)))
+      (setq url (or (w3m-url-readable-string url)
+		    (and (w3m-action) "There is a form")
+		    "There is no url under point"))
+      (w3m-message "%s" (cond
+			 ((> (length alt) 0)
+			  (concat alt ": " url))
+			 ((> (length title) 0)
+			  ;; XEmacs21 doesn't have `message-truncate-lines'
+			  ;; and always truncates messages, so one line in
+			  ;; that case.
+			  (let ((str (concat title " (" url ")")))
+			    (if (or (not (boundp 'message-truncate-lines))
+				    message-truncate-lines
+				    (< (string-width str) (- (frame-width) 2)))
+				;; one line if fits or truncating
+				str
+			      ;; or two lines if bigger than frame-width
+			      (concat title "\n" url))))
+			 (t
+			  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"
+      (and url interactive-p (kill-new (w3m-url-encode-string-2 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")))))
+		       "There is no image url under point")))))
 
 (defmacro w3m-delete-all-overlays ()
   "Delete all momentary overlays."
@@ -5837,8 +7307,7 @@
 (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 (save-excursion (end-of-line)
-			       (point)))
+  (let ((limit (point-at-eol))
 	ov beg pos pseq)
     (save-excursion
       (beginning-of-line)
@@ -5851,7 +7320,7 @@
 	(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-face)
+	(overlay-put ov 'face 'w3m-current-anchor)
 	(overlay-put ov 'w3m-momentary-overlay t)
 	(overlay-put ov 'evaporate t)
 	t))))
@@ -5883,7 +7352,7 @@
 (defun w3m-edit-url (url)
   "Edit the page pointed by URL."
   (interactive (list (w3m-input-url)))
-  (when (string-match "\\`about://\\(header\\|source\\)/" url)
+  (when (string-match "\\`about://\\(?:header\\|source\\)/" url)
     (setq url (substring url (match-end 0))))
   (catch 'found
     (dolist (pair w3m-edit-function-alist)
@@ -5940,18 +7409,19 @@
       (setcdr w3m-goto-anchor-hist nil)))
   (if (< arg 0)
       (w3m-previous-anchor (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-next-anchor)
-	(setq w3m-goto-anchor-hist nil)
-	(if (w3m-imitate-widget-button)
-	    (widget-forward 1)
-	  ;; Make a search from the beginning of the buffer.
-	  (goto-char (point-min))
-	  (w3m-goto-next-anchor)))
-      (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)))
+    (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)))
 
@@ -5989,18 +7459,22 @@
       (setcdr w3m-goto-anchor-hist nil)))
   (if (< arg 0)
       (w3m-next-anchor (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-previous-anchor)
-	(setq w3m-goto-anchor-hist nil)
-	(if (w3m-imitate-widget-button)
-	    (widget-forward -1)
-	  ;; Make a search from the end of the buffer.
-	  (goto-char (point-max))
-	  (w3m-goto-previous-anchor)))
-      (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)))
+    (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)))
 
@@ -6154,7 +7628,7 @@
     (w3m-horizontal-on-screen)
     (w3m-print-this-url)))
 
-(defun w3m-copy-buffer (&optional buffer newname just-copy empty)
+(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.
 
@@ -6164,13 +7638,15 @@
 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.
+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: "))))
+		     (if current-prefix-arg (read-string "Name: "))
+		     t))
   (unless buffer
     (setq buffer (current-buffer)))
   (unless newname
@@ -6186,22 +7662,30 @@
 	    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 (generate-new-buffer newname)))
+      (w3m-history-store-position)
+      (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-initial-frames init-frames
+      (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)))
-    (if (and (not just-copy) empty)
-	;; Pop to a window or a frame up because `w3m-goto-url' is not called.
-	(w3m-popup-buffer new)
+    (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))
-    (unless empty
+      (set-buffer new)
       ;; Render a page.
       (let ((positions (copy-sequence (car w3m-history)))
 	    (w3m-history-reuse-history-elements t)
@@ -6211,20 +7695,26 @@
 			;; Pass the properties of the history elements,
 			;; although it is currently always nil.
 			(w3m-history-element (cadr positions))))
-	(setcar w3m-history 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 (zerop arg)
-    (let ((buffers (if (> arg 0)
-		       (w3m-list-buffers)
-		     (setq arg (- arg))
-		     (nreverse (w3m-list-buffers)))))
+  (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
-       (or (nth arg (memq (current-buffer) buffers))
-	   (nth (1- arg) buffers))))
+       (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)))
 
@@ -6239,14 +7729,20 @@
 terminating the emacs-w3m session; the prefix argument FORCE will be
 passed to the `w3m-quit' function (which see)."
   (interactive "P")
-  (let* ((buffers (w3m-list-buffers t))
+  ;; 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)
-	  (w3m-next-buffer -1)
+	  (progn
+	    (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)
@@ -6292,12 +7788,20 @@
 		   (w3m-next-buffer -1)
 		 (unless (one-window-p t)
 		   (delete-window))))))
+      (w3m-session-deleted-save (list cur))
       (w3m-process-stop cur)
-      (kill-buffer cur)
+      (w3m-idle-images-show-unqueue cur)
+      (let ((frame-auto-delete nil)
+	    (ignore-window-parameters t))
+	(kill-buffer cur))
       (when w3m-use-form
 	(w3m-form-kill-buffer cur))
-      (run-hooks 'w3m-delete-buffer-hook)))
-  (w3m-select-buffer-update))
+      (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.
@@ -6321,14 +7825,14 @@
 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)
+  (let ((count 1) number newname)
     (dolist (buffer (w3m-list-buffers))
       (setq number (w3m-buffer-number buffer))
       (when number
 	(unless (eq number count)
-	  (when (and (w3m-buffer-set-number buffer count)
+	  (when (and (setq newname (w3m-buffer-set-number buffer count))
 		     w3m-use-form)
-	    (w3m-form-set-number buffer count)))
+	    (w3m-form-set-number buffer newname)))
 	(incf count)))))
 
 (defun w3m-delete-other-buffers (&optional buffer)
@@ -6338,17 +7842,110 @@
     (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-select-buffer-update))
+  (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-e" 'w3m-goto-new-session-url)
+    (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)
+    (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-lnum-map nil
+  "Sub-keymap used for the `L'-prefixed link numbering commands.")
+(unless w3m-lnum-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "f" 'w3m-lnum-follow)
+    (define-key map "F" 'w3m-lnum-goto)
+    (define-key map "w" 'w3m-lnum-universal)
+    (define-key map "I" 'w3m-lnum-view-image)
+    (define-key map "\M-i" 'w3m-lnum-save-image)
+    (define-key map "d" 'w3m-lnum-download-this-url)
+    (define-key map "e" 'w3m-lnum-edit-this-url)
+    (define-key map "t" 'w3m-lnum-toggle-inline-image)
+    (define-key map "u" 'w3m-lnum-print-this-url)
+    (define-key map "b" 'w3m-lnum-bookmark-add-this-url)
+    (define-key map "]" 'w3m-lnum-zoom-in-image)
+    (define-key map "[" 'w3m-lnum-zoom-out-image)
+    (setq w3m-lnum-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)
@@ -6358,20 +7955,19 @@
     (define-key map [delete] 'w3m-scroll-down-or-previous-url)
     (if (featurep 'xemacs)
 	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      ;; Note: It does not have an effect on Emacs 19.
       (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" (lambda () (interactive) (scroll-up 1)))
+    (define-key map "J" 'w3m-scroll-up)
     (define-key map "K" (lambda () (interactive) (scroll-down 1)))
-    (define-key map "\M-g" 'goto-line)
     (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)
@@ -6379,25 +7975,29 @@
     (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.
+      ;; 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 "\C-c\C-@" 'w3m-history-store-position)
-    (if (featurep 'xemacs)
-	(define-key map [?\C-c (control space)] 'w3m-history-store-position)
-      ;; `C- ' doesn't mean `C-SPC' in XEmacs.
-      (define-key map [?\C-c ?\C-\ ] 'w3m-history-store-position))
-    (define-key map "\C-c\C-v" 'w3m-history-restore-position)
     (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)
@@ -6406,30 +8006,29 @@
     (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 "\C-tt" 'w3m-create-empty-session)
     (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-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 "\C-c\C-t" 'w3m-copy-buffer)
-    (define-key map "\C-c\C-p" 'w3m-previous-buffer)
-    (define-key map "\C-c\C-n" 'w3m-next-buffer)
-    (define-key map "\C-c\C-w" 'w3m-delete-buffer)
-    (define-key map "\C-c\M-w" 'w3m-delete-other-buffers)
-    (define-key map "\C-c\C-s" 'w3m-select-buffer)
-    (define-key map "\C-c\C-a" 'w3m-switch-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)
@@ -6452,17 +8051,16 @@
     (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 "C" (make-sparse-keymap))
-    (define-key map "Ct" 'w3m-redisplay-with-content-type)
-    (define-key map "Cc" 'w3m-redisplay-with-charset)
-    (define-key map "CC" 'w3m-redisplay-and-reset)
-    (define-key map "\C-c\C-b" 'report-emacs-w3m-bug)
-    (define-key map "\C-c\C-c" 'w3m-submit-form)
-    (define-key map "\C-c\C-k" 'w3m-process-stop)
+    (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-lnum-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)
@@ -6471,12 +8069,12 @@
     (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
     (if (featurep 'xemacs)
 	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      ;; Note: It does not have an effect on Emacs 19.
       (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)
@@ -6487,14 +8085,21 @@
 	  (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.
+      ;; 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 "\C-c\C-@" 'w3m-history-store-position)
-    (define-key map [?\C-c?\C- ] 'w3m-history-store-position)
-    (define-key map "\C-c\C-v" 'w3m-history-restore-position)
+    (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)
@@ -6506,14 +8111,15 @@
     (define-key map "E" 'w3m-edit-this-url)
     (define-key map "f" 'undefined) ;; reserved.
     (define-key map "g" 'w3m-goto-url)
-    (define-key map "\M-g" 'goto-line)
     (define-key map "G" 'w3m-goto-url-new-session)
+    (define-key map "\C-tt" 'w3m-create-empty-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))
@@ -6521,18 +8127,14 @@
     (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 "\C-c\C-t" 'w3m-copy-buffer)
-    (define-key map "\C-c\C-p" 'w3m-previous-buffer)
-    (define-key map "\C-c\C-n" 'w3m-next-buffer)
-    (define-key map "\C-c\C-w" 'w3m-delete-buffer)
-    (define-key map "\C-c\M-w" 'w3m-delete-other-buffers)
-    (define-key map "\C-c\C-s" 'w3m-select-buffer)
-    (define-key map "\C-c\C-a" 'w3m-switch-buffer)
+    (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)
@@ -6541,14 +8143,13 @@
     (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" (lambda ()
-			  (interactive)
-			  (let ((current-prefix-arg t))
-			    (call-interactively '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)
@@ -6568,13 +8169,10 @@
     (define-key map "[" 'w3m-previous-form)
     (define-key map "}" 'w3m-next-image)
     (define-key map "{" 'w3m-previous-image)
-    (define-key map "C" (make-sparse-keymap))
-    (define-key map "Ct" 'w3m-redisplay-with-content-type)
-    (define-key map "Cc" 'w3m-redisplay-with-charset)
-    (define-key map "CC" 'w3m-redisplay-and-reset)
-    (define-key map "\C-c\C-b" 'report-emacs-w3m-bug)
-    (define-key map "\C-c\C-c" 'w3m-submit-form)
-    (define-key map "\C-c\C-k" 'w3m-process-stop)
+    (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-lnum-map)
     (setq w3m-info-like-map map)))
 
 (defun w3m-alive-p (&optional visible)
@@ -6603,25 +8201,36 @@
 is specified, otherwise prompt you for the confirmation.  See also
 `w3m-close-window'."
   (interactive "P")
-  (when (or force
-	    (prog1 (y-or-n-p "Do you want to exit w3m? ")
-	      (w3m-message "")))
-    (w3m-delete-frames-and-windows)
-    (sit-for 0) ;; Delete frames seemingly fast.
-    (dolist (buffer (w3m-list-buffers t))
-      (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)))
+  (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).
@@ -6629,6 +8238,9 @@
 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)
@@ -6644,13 +8256,16 @@
 	(setq window (pop windows))
 	(set-window-buffer
 	 window
-	 (w3m-static-cond ((featurep 'xemacs)
-			   (other-buffer buf (window-frame window) nil))
-			  ((>= emacs-major-version 20)
-			   (other-buffer buf nil (window-frame window)))
-			  (t
-			   (other-buffer buf)))))))
-  (w3m-select-buffer-close-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
@@ -6658,22 +8273,210 @@
 	    w3m-info-like-map
 	  w3m-lynx-like-map)))
 
-(defun w3m-clean-hook-options ()
-  "Remove the functions which should be set newly from some hooks."
-  (dolist (elem '((w3m-mode-hook w3m-setup-header-line
-				 w3m-setup-widget-faces
-				 w3m-update-tab-line)
-		  (w3m-fontify-after-hook w3m-header-line-insert
-					  w3m-update-tab-line)
-		  (w3m-display-hook w3m-select-buffer-update
-				    w3m-favicon-setup
-				    w3m-xmas-update-tab-in-gutter)
-		  (w3m-delete-buffer-hook w3m-select-buffer-update
-					  w3m-update-tab-line)))
-    (dolist (func (cdr elem))
-      (when (memq func (symbol-value (car elem)))
-	(message "Remove `%s' from `%s'" func (car elem))
-	(remove-hook (car elem) func)))))
+(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 "新しいタブ" "New Tab")
+       t ,w3m-new-session-in-background w3m-new-session-url)
+      (w3m-copy-buffer
+       ,(w3m-make-menu-item "タブを複製" "Copy Tab")
+       ,currentp ,w3m-new-session-in-background)
+      -
+      (w3m-reload-this-page
+       ,(w3m-make-menu-item "タブを再読み込み" "Reload Tab")
+       ,currentp)
+      (w3m-reload-all-pages
+       ,(w3m-make-menu-item "すべてのタブを再読み込み" "Reload All Tabs")
+       ,manyp)
+      -
+      (w3m-delete-buffer
+       ,(w3m-make-menu-item "このタブを閉じる" "Close This Tab")
+       ,currentp)
+      -
+      (w3m-delete-other-buffers
+       ,(w3m-make-menu-item "他のタブをすべて閉じる" "Close Other Tabs")
+       ,many2p)
+      (w3m-delete-left-tabs
+       ,(w3m-make-menu-item "左側のタブをすべて閉じる" "Close Left Tabs")
+       ,leftp)
+      (w3m-delete-right-tabs
+       ,(w3m-make-menu-item "右側のタブをすべて閉じる" "Close Right Tabs")
+       ,rightp)
+      -
+      (w3m-view-url-with-external-browser
+       ,(w3m-make-menu-item "外部ブラウザで開く" "View with external browser")
+       ,currentp ,w3m-new-session-in-background w3m-current-url)
+      -
+      (w3m-session-save
+       ,(w3m-make-menu-item "すべてのタブを保存する" "Save All Tabs...")
+       t)
+      (w3m-session-select
+       ,(w3m-make-menu-item "タブリストを選択する" "Select List of Tabs...")
+       t)
+      (w3m-bookmark-add-current-url
+       ,(w3m-make-menu-item "このタブをブックマーク" "Bookmark This Tab...")
+       ,currentp ,w3m-new-session-in-background)
+      (w3m-bookmark-add-all-urls
+       ,(w3m-make-menu-item
+	 "すべてのタブをブックマーク" "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 "リンクをこのセッションで開く"
+			  "Open Link in This Session")
+     w3m-view-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "リンクを新しいセッションで開く"
+			  "Open Link in New Session")
+     w3m-view-this-url-new-session (w3m-anchor (point))]
+    [,(w3m-make-menu-item "リンクを外部ブラウザで開く"
+			  "Open Link in an External Browser")
+     w3m-external-view-this-url (w3m-anchor (point))]
+    "-"
+    [,(w3m-make-menu-item "このリンクをブックマーク..."
+			  "Bookmark This Link...")
+     w3m-bookmark-add-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "名前を付けてリンク先を保存..."
+			  "Save Link As...")
+     w3m-download-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "名前を付けて画像を保存..."
+			  "Save Image As...")
+     w3m-download-this-image (w3m-image (point))]
+    [,(w3m-make-menu-item "リンクの URL をコピー"
+			  "Copy Link Location")
+     w3m-print-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "画像の URL をコピー"
+			  "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-make-local-hook 'pre-command-hook)
+  (add-hook 'pre-command-hook 'w3m-set-buffer-seen nil t))
+
+(defun w3m-set-buffer-seen ()
+  (setq w3m-buffer-unseen nil)
+  (remove-hook 'pre-command-hook 'w3m-set-buffer-seen t))
+
+(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.
@@ -6698,6 +8501,7 @@
 \\[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.
@@ -6720,15 +8524,27 @@
 
 \\[w3m-goto-url]	Visit the web page.
 \\[w3m-goto-url-new-session]	Visit the web page in a new session.
+\\[w3m-goto-new-session-url]	Open page of which url is specified by\
+ `w3m-new-session-url' in\n\ta 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-this-url]	Download the file or the page under point.
+\\[w3m-delete-left-tabs]	Delete tabs on the left side of\
+ the current tab.
+\\[w3m-delete-right-tabs]	Delete tabs on the right side of\
+ the current tab.
+\\[w3m-tab-move-left]	Move this tab N (default 1) times to the left.
+\\[w3m-tab-move-right]	Move this tab N (default 1) times to the right.
+
+\\[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-image]	Toggle the visibility of an image under point.
 \\[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.
 
@@ -6743,11 +8559,14 @@
  page.
 \\[w3m-edit-this-url]	Edit the local file which is pointed to by URL under\
  point.
+\\[w3m-cookie]	Display cookies and enable you to manage them.
 
 \\[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-up]	Scroll the current window up one line (or lines\
+ of which the number\n\tyou specify by the prefix argument).
 \\[w3m-scroll-left]	Scroll to the left.
 \\[w3m-scroll-right]	Scroll to the right.
 \\[w3m-shift-left]	Shift to the left.
@@ -6775,22 +8594,31 @@
 \\[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-pipe-source]	Pipe a page source to a shell command.
 
 \\[w3m-bookmark-view]	Display the bookmark.
-\\[w3m-bookmark-add-current-url]	Add the url of the current page to\
+\\[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-create-empty-session]	Create an empty page as a new session and\
+ visit it.
 \\[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-move-unseen-buffer]	Move to the next unseen buffer.
 \\[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.
@@ -6801,8 +8629,11 @@
 \\[w3m-close-window]	Close all emacs-w3m windows, without deleteing\
  buffers.
 \\[w3m-quit]	Exit browsing web.  All emacs-w3m buffers will be deleted.
+\\[w3m-process-stop]	Try to stop internal processes of a page.
 
 \\[describe-mode]	describe-mode.
+\\[w3m-mouse-major-mode-menu]	Pop up a w3m-mode specific menu of mouse\
+ commands.
 
 \\[report-emacs-w3m-bug]	Send a bug report to the emacs-w3m team.
 "
@@ -6811,7 +8642,10 @@
   (setq major-mode 'w3m-mode)
   (setq mode-name "w3m")
   (use-local-map w3m-mode-map)
-  (setq truncate-lines t
+  ;; Force paragraph direction to be left-to-right.  Don't make it
+  ;; bound globally in old Emacsen and XEmacsen.
+  (set (make-local-variable 'bidi-paragraph-direction) 'left-to-right)
+  (setq	truncate-lines t
 	w3m-display-inline-images w3m-default-display-inline-images)
   (when w3m-auto-show
     (when (boundp 'auto-hscroll-mode)
@@ -6823,67 +8657,193 @@
     (when (boundp 'hscroll-mode)
       (set (make-local-variable 'hscroll-mode) nil)))
   (make-local-variable 'list-buffers-directory)
-  (w3m-clean-hook-options)
+  (w3m-static-unless (featurep 'xemacs)
+    (setq show-trailing-whitespace nil))
+  (when (boundp 'mwheel-scroll-up-function)
+    (eval '(set (make-local-variable (quote mwheel-scroll-up-function))
+		(function w3m-mwheel-scroll-up)))
+    (eval '(set (make-local-variable (quote mwheel-scroll-down-function))
+		(function w3m-mwheel-scroll-down))))
   (w3m-setup-toolbar)
   (w3m-setup-menu)
   (run-hooks 'w3m-mode-setup-functions)
-  (run-hooks 'w3m-mode-hook))
+  (w3m-run-mode-hooks 'w3m-mode-hook))
+
+(condition-case nil
+    (define-obsolete-function-alias 'w3m-scroll-up-1 'w3m-scroll-up
+      "2013-01-23")
+  (wrong-number-of-arguments ;; XEmacs
+   (define-obsolete-function-alias 'w3m-scroll-up-1 'w3m-scroll-up)))
+(defun w3m-scroll-up (&optional arg mwheel)
+  "Scroll the current window up ARG lines.
+ARG will be fixed into 1 when this function is called interactively.
+MWHEEL indicates that this function is called by the mouse wheel.
+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))
+  (let ((cur (point))
+	end)
+    (goto-char (point-max))
+    (skip-chars-backward "\t\n\r ")
+    (forward-line 1)
+    (setq end (point))
+    (goto-char cur)
+    (if (and (or mwheel (not arg))
+	     (pos-visible-in-window-p end))
+	(run-with-timer 1e-9 nil
+			(lambda (win pos)
+			  (when (window-live-p win)
+			    (goto-char pos)
+			    (recenter -1)
+			    (w3m-message "End of buffer")))
+			(selected-window) end)
+      (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)
+      (when (and truncate-lines
+		 (or mwheel (not arg))
+		 (pos-visible-in-window-p end))
+	(setq cur (point))
+	(goto-char end)
+	(recenter -1)
+	(goto-char cur)))))
+
+(defun w3m-mwheel-scroll-up (&optional arg)
+  (w3m-scroll-up arg t))
 
 (defun w3m-scroll-up-or-next-url (arg)
   "Scroll the current window up ARG lines, or go to the next page."
   (interactive "P")
-  (w3m-keep-region-active)
-  (if (pos-visible-in-window-p (point-max))
-      (if w3m-next-url
-	  (w3m-goto-url w3m-next-url)
-	(signal 'end-of-buffer nil))
-    (scroll-up arg)))
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-up arg)
+    (w3m-keep-region-active)
+    (if (and w3m-next-url
+	     (pos-visible-in-window-p (let ((cur (point)))
+					(goto-char (point-max))
+					(skip-chars-backward "\t\n\r ")
+					(forward-line 1)
+					(prog1
+					    (point)
+					  (goto-char cur)))))
+	(let ((w3m-prefer-cache t))
+	  (w3m-history-store-position)
+	  (w3m-goto-url w3m-next-url))
+      (w3m-scroll-up arg))))
+
+(defun w3m-scroll-down (&optional arg mwheel)
+  "Scroll the current window down ARG lines.
+ARG will be fixed into 1 when this function is called interactively.
+MWHEEL indicates that this function is called by the mouse wheel."
+  (interactive '(1))
+  (if (and (or mwheel (not arg))
+	   (pos-visible-in-window-p (point-min)))
+      (run-with-timer 1e-9 nil
+		      (lambda (win)
+			(when (window-live-p win)
+			  (select-window win)
+			  (goto-char (point-min))
+			  (recenter 0)
+			  (w3m-message "Beginning of buffer")))
+		      (selected-window))
+    (scroll-down arg)))
+
+(defun w3m-mwheel-scroll-down (&optional arg)
+  (w3m-scroll-down arg t))
 
 (defun w3m-scroll-down-or-previous-url (arg)
   "Scroll the current window down ARG lines, or go to the previous page."
   (interactive "P")
-  (w3m-keep-region-active)
-  (if (pos-visible-in-window-p (point-min))
-      (if w3m-previous-url
-	  (w3m-goto-url w3m-previous-url)
-	(signal 'beginning-of-buffer nil))
-    (scroll-down arg)))
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-down arg)
+    (w3m-keep-region-active)
+    (if (and w3m-previous-url
+	     (pos-visible-in-window-p (point-min)))
+	(let ((w3m-prefer-cache t))
+	  (w3m-history-store-position)
+	  (w3m-goto-url w3m-previous-url))
+      (w3m-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")
-  (w3m-horizontal-scroll 'left (if arg
-				   (prefix-numeric-value arg)
-				 w3m-horizontal-scroll-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-scroll-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-forward-hscroll arg)
+    (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 arg))))
 
 (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")
-  (w3m-horizontal-scroll 'right (if arg
-				    (prefix-numeric-value arg)
-				  w3m-horizontal-scroll-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-scroll-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-backward-hscroll arg)
+    (if (zerop (window-hscroll))
+	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	  (ding))
+      (w3m-horizontal-scroll 'right arg))))
 
 (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")
-  (w3m-horizontal-scroll 'left (if arg
-				   (prefix-numeric-value arg)
-				 w3m-horizontal-shift-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-shift-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-forward-hscroll arg)
+    (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 arg))))
 
 (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")
-  (w3m-horizontal-scroll 'right (if arg
-				    (prefix-numeric-value arg)
-				  w3m-horizontal-shift-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-shift-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-backward-hscroll arg)
+    (if (zerop (window-hscroll))
+	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	  (ding))
+      (w3m-horizontal-scroll 'right arg))))
 
 (defvar w3m-horizontal-scroll-done nil)
 (make-variable-buffer-local 'w3m-horizontal-scroll-done)
@@ -6898,10 +8858,15 @@
 	     (not (and (eq last-command this-command)
 		       (or (eq (point) (point-min))
 			   (eq (point) (point-max)))))
-	     (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))))
+	     (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))
 
@@ -6993,42 +8958,54 @@
 		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")
-  (w3m-keep-region-active)
-  (when (listp arg)
-    (setq arg (car arg)))
-  (set-window-hscroll (selected-window) 0)
-  (beginning-of-line arg))
+  (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")
-  (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)
+  (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 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)))
+	    (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."
@@ -7054,7 +9031,8 @@
 
 (defun w3m-goto-mailto-url (url &optional post-data)
   (let ((before (nreverse (buffer-list)))
-	comp info buffers buffer function)
+	comp info body buffers buffer function)
+    (setq url (w3m-decode-entities-string (w3m-url-decode-string url)))
     (save-window-excursion
       (if (and (symbolp w3m-mailto-url-function)
 	       (fboundp w3m-mailto-url-function))
@@ -7068,27 +9046,28 @@
 		     (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)))
+	    ;; Use rfc2368.el
 	    (progn
-	      (setq info (rfc2368-parse-mailto-url url))
+	      (setq info (rfc2368-parse-mailto-url url)
+		    body (assoc "Body" info)
+		    info (delq body info)
+		    body (delq nil (list (cdr body))))
+	      (when post-data
+		(setq body (nconc body (list (if (consp post-data)
+						 (car post-data)
+					       post-data)))))
 	      (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.
+		     (append (mapcar
+			      (lambda (x)
+				(prog1
+				    (cdr (assoc x info))
+				  (setq info (delq (assoc x info) info))))
+			      '("To" "Subject"))
+			     (list info))))
+	  ;; W/o rfc2368.el
+	  (string-match ":\\([^?]+\\)" url)
 	  (funcall comp (match-string 1 url)))))
     (setq buffers (nreverse (buffer-list)))
     (save-current-buffer
@@ -7102,14 +9081,25 @@
 				 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)))))
+      (let (same-window-buffer-names same-window-regexps mod)
+	(w3m-static-if (boundp 'display-buffer-alist)
+	    (let (display-buffer-alist)
+	      (funcall function buffer))
+	  (let (special-display-buffer-names special-display-regexps)
+	    (funcall function buffer)))
+	(when body
+	  (setq mod (buffer-modified-p))
+	  (goto-char (point-min))
+	  (search-forward (concat "\n" (regexp-quote mail-header-separator)
+				  "\n") nil 'move)
+	  (unless (bolp) (insert "\n"))
+	  (while body
+	    (insert (pop body))
+	    (unless (bolp) (insert "\n")))
+	  (set-buffer-modified-p mod))))))
 
 (defun w3m-convert-ftp-url-for-emacsen (url)
-  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(/~/\\)?" url)
+  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(?:/~/\\)?" url)
 	   (concat "/"
 		   (if (match-beginning 1)
 		       (substring url (match-beginning 1) (match-end 1))
@@ -7157,7 +9147,7 @@
 			     (y-or-n-p
 			      (format "File(%s) already exists. Overwrite? "
 				      filename))
-			   (w3m-message ""))
+			   (message nil))
 			 (progn
 			   (delete-file filename)
 			   t))
@@ -7165,20 +9155,62 @@
 	(copy-file ftp filename)
 	(message "Wrote %s" filename)))))
 
-(eval-and-compile
-  (unless (fboundp 'w3m-add-local-hook)
-    ;; Silence the byte compiler; `w3m-add-local-hook' will be defined
-    ;; in another place for Emacs in which `make-local-hook' is obsolete.
-    (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.
-Note: this function is designed for Emacsen other than Emacs 21 and
-later."
-      (make-local-hook hook)
-      (add-hook hook function append t))))
+(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)))))
 
 (defun w3m-store-current-position ()
   "Memorize the current positions whenever every command starts.
@@ -7186,15 +9218,19 @@
 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 (line-beginning-position))
-				   (copy-marker (line-end-position)))))
+				   (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))
-    (run-hooks 'w3m-after-cursor-move-hook)))
+    ;; 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.
@@ -7204,17 +9240,19 @@
     (let ((buffer (w3m-alive-p t)))
       (if buffer
 	  (set-buffer buffer)
-	(set-buffer (generate-new-buffer "*w3m*"))
+	(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-static-when (or (featurep 'xemacs)
-		       (> emacs-major-version 20))
-    (w3m-initialize-graphic-icons))
+  (w3m-make-local-hook 'pre-command-hook)
+  (w3m-make-local-hook 'post-command-hook)
+  (add-hook 'pre-command-hook 'w3m-store-current-position nil t)
+  (add-hook 'post-command-hook 'w3m-check-current-position nil t)
+  (w3m-initialize-graphic-icons)
   (setq mode-line-buffer-identification
-	`("%b "
+	`(,@(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
@@ -7234,7 +9272,9 @@
 	  (w3m-current-process
 	   "Loading..." ,(if (fboundp 'format-mode-line)
 			     '(:eval (w3m-modeline-title))
-			   'w3m-current-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)
@@ -7253,85 +9293,94 @@
 
 (eval-when-compile
   (unless (fboundp 'format-mode-line)
-    (defalias 'format-mode-line 'ignore))
-  (unless (fboundp 'w3m-force-window-update)
-    (defalias 'w3m-force-window-update 'ignore)))
+    (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."
-  (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)
-			     (when (eq (selected-window)
-				       (get-buffer-window buffer))
-			       (w3m-force-window-update)))))
-		       (current-buffer))))))
+  (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)))))))
 
 ;;;###autoload
 (defun w3m-goto-url (url &optional reload charset post-data referer handler
-			 element)
+			 element no-popup save-pos)
   "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
+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 and ELEMENT[1] are for the internal operations
-of emacs-w3m.
+The remaining HANDLER, ELEMENT[1], NO-POPUP, and SAVE-POS[2] 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'.
+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."
+Notes for the developers:
+\[1] 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.
+
+\[2] SAVE-POS leads this function to save the current emacs-w3m window
+configuration; i.e. to run `w3m-history-store-position'.
+`w3m-history-store-position' should be called in a w3m-mode buffer, so
+this will be convenient if a command that calls this function may be
+invoked in other than a w3m-mode buffer."
   (interactive
-   (list
-    (w3m-input-url nil
-		   (or (w3m-active-region-or-url-at-point)
-		       (when (stringp w3m-current-url)
-			 (if (string-match "\\`about://\\(header\\|source\\)/"
-					   w3m-current-url)
-			     (substring w3m-current-url (match-end 0))
-			   w3m-current-url))))
-    current-prefix-arg
-    (w3m-static-if (fboundp 'universal-coding-system-argument)
-	coding-system-for-read)))
+   (list (if 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-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 (w3m-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))
-    (setq url (w3m-url-transfer-encode-string url w3m-default-coding-system)))
+    (w3m-string-match-url-components url)
+    (setq url (concat (save-match-data
+			(w3m-url-transfer-encode-string
+			 (substring url 0 (match-beginning 8))))
+		      (if (match-beginning 8)
+			  (concat "#" (match-string 9 url))
+			""))))
   (cond
    ;; process mailto: protocol
    ((string-match "\\`mailto:" url)
@@ -7362,10 +9411,27 @@
 				 (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.
-    (w3m-popup-buffer (current-buffer))
+    (unless no-popup
+      (w3m-popup-buffer (current-buffer)))
     (w3m-cancel-refresh-timer (current-buffer))
     (when w3m-current-process
       (error "%s"
@@ -7373,19 +9439,26 @@
 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.
-    ;; Store the current position in the history structure.
-    (w3m-history-store-position)
+    (w3m-idle-images-show-unqueue (current-buffer))
+    ;; Store the current position in the history structure if SAVE-POS
+    ;; is set or this command is called interactively.
+    (when (or save-pos (w3m-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)) "&"))))
+			    (split-string (substring url (match-end 0)) "&")))
+	      (w3m-async-exec (and w3m-async-exec-with-many-urls
+				   w3m-async-exec))
+	      buffers)
 	  (w3m-process-do
-	      (type (prog1
-			(w3m-goto-url (car urls))
-		      (dolist (url (cdr urls))
-			(save-excursion
-			  (set-buffer (w3m-copy-buffer nil nil nil 'empty))
-			  (save-window-excursion
+	      (type (save-window-excursion
+		      (prog1
+			  (w3m-goto-url (pop urls))
+			(dotimes (i (length urls))
+			  (push (w3m-copy-buffer nil nil nil 'empty) buffers))
+			(dolist (url (nreverse urls))
+			  (with-current-buffer (pop buffers)
 			    (w3m-goto-url url))))))
 	    type))
       ;; Retrieve the page.
@@ -7415,7 +9488,8 @@
 	  (when (setq w3m-current-forms
 		      (when (and (not reload) ; If reloading, ignore history.
 				 (null post-data) ; If post, ignore history.
-				 (w3m-cache-available-p url))
+				 (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.
@@ -7432,10 +9506,13 @@
 	    (setq url (replace-match "about://dtree/" nil nil url)
 		  orig url))
 	  ;; Split body and fragments.
-	  (and (string-match w3m-url-components-regexp url)
-	       (match-beginning 8)
+	  (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)
@@ -7445,6 +9522,15 @@
 		   (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))))
@@ -7456,10 +9542,17 @@
 				      (list :title (or w3m-current-title
 						       "<no-title>")))
 		    (goto-char (point-min)))
-		(if (and name (w3m-search-name-anchor name))
-		    (setf (w3m-arrived-time (w3m-url-strip-authinfo orig))
-			  (w3m-arrived-time url))
-		  (goto-char (point-min)))
+		(w3m-string-match-url-components w3m-current-url)
+		(and (match-beginning 8)
+		     (setq name (match-string 9 w3m-current-url)))
+		(when (and name
+			   (progn
+			     ;; Redisplay to search an anchor sure.
+			     (sit-for 0)
+			     (w3m-search-name-anchor
+			      name 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
@@ -7498,65 +9591,114 @@
 	      (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 (or (w3m-real-url url) url)))
+	      (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)
-  (let (file)
-    (file-name-as-directory
-     (if (and url (stringp url))
-	 (if (string-match "\\`ftp://" url)
-	     (progn
-	       (setq file (w3m-convert-ftp-url-for-emacsen url))
-	       (if (string-match "/\\`" file)
-		   file
-		 (file-name-directory file)))
-	   (setq file (w3m-url-to-file-name url))
-	   (if (and file (file-exists-p file))
-	       (if (file-directory-p file)
-		   file
-		 (file-name-directory file))
-	     w3m-profile-directory))
-       w3m-profile-directory))))
-
-;; Alias to meet `run-at-time' bug of XEmacs.  It runs the timer
-;; function almost immediately, so we use the emulated version
-;; instead.
-(eval-and-compile
-  (unless (fboundp 'w3m-run-at-time)
-    (defalias 'w3m-run-at-time 'run-at-time)))
+  "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
-	    (w3m-run-at-time (car w3m-current-refresh)
-			     nil
-			     'w3m-goto-url-with-timer
-			     (cdr w3m-current-refresh)
-			     (current-buffer))))))
+	    (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))
-    (if (get-buffer-window buffer)
-	(save-selected-window
-	  (pop-to-buffer buffer)
-	  (with-current-buffer buffer
-	    (w3m-cancel-refresh-timer buffer)
-	    (w3m-goto-url url (and w3m-current-url
-				   (string= url w3m-current-url)))))
+    (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)))))
+	(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
@@ -7566,18 +9708,12 @@
 will be created by copying the current session.  Otherwise, the new
 session will start afresh."
   (interactive
-   (list
-    (w3m-input-url nil
-		   (when (stringp w3m-current-url)
-		     (if (string-match "\\`about://\\(header\\|source\\)/"
-				       w3m-current-url)
-			 (substring w3m-current-url (match-end 0))
-		       w3m-current-url)))
-    current-prefix-arg
-    (w3m-static-if (fboundp 'universal-coding-system-argument)
-	coding-system-for-read)
-    nil ;; post-data
-    nil)) ;; referer
+   (list (w3m-input-url nil nil w3m-new-session-url 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))
@@ -7585,16 +9721,21 @@
 		   (w3m-popup-buffer buffer)
 		   t)))
 	(progn
-	  (switch-to-buffer (setq buffer
-				  (w3m-copy-buffer nil nil nil 'empty)))
+	  ;; 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 (string-match w3m-url-components-regexp url)
-				 (match-beginning 8)
+			    (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.
@@ -7615,9 +9756,15 @@
   (interactive)
   (unless w3m-home-page
     (error "You have to specify the value of `w3m-home-page'"))
-  (w3m-goto-url w3m-home-page))
+  (w3m-goto-url w3m-home-page t nil nil nil nil nil nil t))
 
-(defun w3m-reload-this-page (&optional arg)
+;;;###autoload
+(defun w3m-create-empty-session ()
+  "Create an empty page as a new session and visit it."
+  (interactive)
+  (w3m-goto-url-new-session "about:blank"))
+
+(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")
@@ -7633,12 +9780,29 @@
 	  (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)))
+		      (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."
@@ -7647,10 +9811,13 @@
       (w3m-message "Can't redisplay this page")
     (when arg
       (setq w3m-display-inline-images (not w3m-display-inline-images)))
-    (let ((w3m-history-reuse-history-elements
+    (let ((w3m-prefer-cache t)
+	  (w3m-history-reuse-history-elements
 	   ;; Don't move the history position.
 	   'reload))
-      (w3m-goto-url w3m-current-url 'redisplay))))
+      (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.
@@ -7662,7 +9829,11 @@
   (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 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)
@@ -7673,7 +9844,10 @@
   (interactive "P")
   (if (null w3m-current-url)
       (w3m-message "Can't execute the command")
-    (setf (w3m-arrived-content-charset w3m-current-url)
+    (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)))
@@ -7705,38 +9879,50 @@
 defaults to the value of `w3m-home-page' or \"about:\"."
   (let ((url (car command-line-args-left))
 	(directives '("-f" "-funcall" "--funcall" "-e"))
-	args directive num)
-    (if (and url
-	     (not (string-match "\\`-" url)))
-	(when (and
-	       (setq args (w3m-static-if (featurep 'xemacs)
-			      ;; Elements of `command-line-args' and
-			      ;; `command-line-args-left' aren't the
-			      ;; identical objects under XEmacs.
-			      (member url command-line-args)
-			    (memq url command-line-args)))
-	       (>= (setq num (- (length command-line-args) (length args) 1))
-		   2)
-	       (equal (nth num command-line-args) "w3m")
-	       (member (setq directive (nth (1- num) command-line-args))
-		       directives))
+	args)
+    (if (and url (not (string-match "\\`-" url)))
+	(progn
 	  (setq command-line-args-left (cdr command-line-args-left))
-	  (setcdr (nthcdr (- num 2) command-line-args)
-		  (cons (concat directive " w3m " url)
-			(nthcdr (+ num 2) command-line-args)))
-	  url)
-      (when (and
-	     (setq args (member "w3m" command-line-args))
-	     (member
-	      (setq directive
-		    (nth (setq num
-			       (- (length command-line-args) (length args) 1))
+	  (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))
-	      directives))
-	(setcdr (nthcdr (1- num) command-line-args)
-		(cons (concat directive " w3m")
-		      (nthcdr (+ num 2) command-line-args)))
-	(or w3m-home-page "about:")))))
+      (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)
@@ -7792,7 +9978,8 @@
 	  (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)))))
+			(w3m-input-url nil nil default w3m-quick-start
+				       'feeling-lucky)))))
       ;; new-session
       (and w3m-make-new-session
 	   (w3m-alive-p)
@@ -7800,6 +9987,7 @@
       ;; 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)))
@@ -7816,13 +10004,20 @@
     (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 (generate-new-buffer "*w3m*"))
+      (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
-	  (w3m-goto-url url)
+	  (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)))))
 
@@ -7843,7 +10038,7 @@
     (setq url (w3m-canonicalize-url url))
     (if new-session
 	(w3m-goto-url-new-session url)
-      (w3m-goto-url url))))
+      (w3m-goto-url url nil nil nil nil nil nil nil t))))
 
 ;;;###autoload
 (defun w3m-find-file (file)
@@ -7853,7 +10048,8 @@
   (w3m-goto-url (w3m-expand-file-name-as-url file)
 		nil
 		(w3m-static-if (fboundp 'universal-coding-system-argument)
-		    coding-system-for-read)))
+		    coding-system-for-read)
+		nil nil nil nil nil t))
 
 (defun w3m-cygwin-path (path)
   "Convert PATH in the win32 style into the cygwin format.
@@ -7881,7 +10077,9 @@
     (let ((w3m-current-buffer (current-buffer)))
       (unless charset
 	(setq charset (w3m-correct-charset (w3m-detect-meta-charset))))
-      (setq w3m-current-url url
+      (setq url (or url
+		    w3m-buffer-local-url)
+	    w3m-current-url url
 	    w3m-current-base-url url
 	    w3m-current-coding-system
 	    (if charset
@@ -7895,6 +10093,13 @@
 	(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)
@@ -7914,39 +10119,39 @@
 </html>")
   "text/html")
 
-(defun w3m-view-source ()
-  "Display the html source of the current buffer."
-  (interactive)
+(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))
+      (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))))
-	  (setq truncate-lines nil))
+				(substring w3m-current-url (match-end 0)))))
 	 (t
-	  (w3m-goto-url  (concat "about://source/" w3m-current-url))
-	  (setq truncate-lines nil))))
+	  (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")
-      (w3m-static-if (boundp 'MULE)
-	  ;; `make-string' doesn't support Japanese chars
-	  ;; and the 1st arg to `make-char' should be int.
-	  (let ((default-mc-flag t))
-	    (with-temp-buffer
-	      (insert-char (make-char (symbol-value 'lc-jp)
-				      40 44)
-			   (/ (w3m-display-width) 2))
-	      (buffer-string)))
-	(make-string (/ (w3m-display-width) 2)
-		     (make-char 'japanese-jisx0208 40 44)))
+      (make-string (/ (w3m-display-width) 2)
+		   (make-char 'japanese-jisx0208 40 44))
     (make-string (w3m-display-width) ?-)))
 
-(defun w3m-about-header (url &optional no-decode no-cache &rest args)
+(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"
@@ -7957,19 +10162,36 @@
 	    "\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)
-		"")))
+	      (if time (current-time-string time) "")))
+
+    (let (anchor anchor-title
+          image-url image-alt image-size)
+      (with-current-buffer w3m-current-buffer
+	(when (equal url w3m-current-url)
+          (setq anchor (w3m-anchor)
+                anchor-title (w3m-anchor-title)
+                image-url (w3m-image)
+                image-alt (w3m-image-alt)
+                image-size (w3m-get-text-property-around 'w3m-image-size))))
+      (if anchor
+	  (insert "\nCurrent Anchor: " anchor))
+      (if anchor-title
+	  (insert "\nAnchor Title:   " anchor-title))
+      (if image-url
+          (insert "\nImage:      " image-url))
+      (if image-alt
+          (insert "\nImage Alt:  " image-alt))
+      (if image-size
+          (insert (format "\nImage Size: %sx%s"
+                          (car image-size) (cdr image-size)))))
+
     (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\nModifer Information\n")
+	(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))
@@ -7977,7 +10199,7 @@
 				  (or (unless no-cache
 					(w3m-cache-request-header url))
 				      (w3m-process-with-wait-handler
-					(w3m-w3m-dump-head url 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))
@@ -8005,19 +10227,25 @@
   "Display the header of the current page."
   (interactive)
   (if w3m-current-url
-      (let ((w3m-prefer-cache t))
-	(cond
-	 ((string-match "\\`about://header/" w3m-current-url)
-	  (w3m-goto-url (substring w3m-current-url (match-end 0))))
-	 ((string-match "\\`about://source/" w3m-current-url)
-	  (w3m-goto-url (concat "about://header/"
-				(substring w3m-current-url (match-end 0))))
-	  (setq truncate-lines nil))
-	 ((string-match "\\`about:" w3m-current-url)
-	  (error "Can't load a header for %s" w3m-current-url))
-	 (t
-	  (w3m-goto-url (concat "about://header/" w3m-current-url))
-	  (setq truncate-lines nil))))
+      (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)
@@ -8122,8 +10350,8 @@
 	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 2) 'size 'start)
+	(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
@@ -8216,7 +10444,11 @@
       (w3m-next-anchor)
       (while (progn
 	       (setq start (point))
-	       (re-search-forward " (\\([0-9]+ \\)*[0-9]+)$" nil t))
+	       ;; Extend href anchor.
+	       (put-text-property (point-at-bol) start
+				  'w3m-href-anchor
+				  (get-text-property start 'w3m-href-anchor))
+	       (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))
@@ -8230,7 +10462,7 @@
 	(w3m-next-anchor)
 	(setq start (point))
 	(end-of-line)
-	(put-text-property start (point) 'face 'w3m-history-current-url-face)
+	(w3m-add-face-property start (point) 'w3m-history-current-url)
 	(goto-char start)))
     (set-buffer-modified-p nil)))
 
@@ -8247,14 +10479,15 @@
    (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) ""))))
+		 (if size (format "&size=%d" size) ""))
+		 nil nil nil nil nil nil nil t))
 
 (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-goto-url "about://history/" nil nil nil nil nil nil nil t)
     (w3m-db-history nil w3m-db-history-display-size)))
 
 (defun w3m-w32-browser-with-fiber (url)
@@ -8267,6 +10500,51 @@
     (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."
@@ -8310,17 +10588,12 @@
 	  (not w3m-select-buffer-horizontal-window))
     (when (get-buffer-window w3m-select-buffer-name)
       (delete-windows-on w3m-select-buffer-name)))
-  (cond ((eq major-mode 'w3m-mode)
-	 (w3m-delete-frames-and-windows (selected-window))
-	 (unless (get-buffer-window w3m-select-buffer-name)
-	   (delete-other-windows)))
-	((eq major-mode 'w3m-select-buffer-mode))
-	(t
-	 (let ((buffer (w3m-alive-p t)))
-	   (if buffer
-	       (w3m-popup-buffer buffer)
-	     (w3m-goto-url (or w3m-home-page "about:"))))
-	 (delete-other-windows)))
+  (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))
@@ -8336,22 +10609,24 @@
   (w3m-select-buffer-mode)
   (or nomsg (w3m-message w3m-select-buffer-message)))
 
-(unless (fboundp 'w3m-update-tab-line)
-  (defalias 'w3m-update-tab-line 'ignore))
-
 (defun w3m-select-buffer-update (&rest args)
   (when (get-buffer-window w3m-select-buffer-name)
     (save-selected-window
       (w3m-select-buffer nil 'update)))
-  (w3m-update-tab-line))
+  (when w3m-use-tab
+    (w3m-force-window-update)))
 
 (defun w3m-select-buffer-generate-contents (current-buffer)
-  (let (buffer-read-only)
+  (let ((i 0)
+	(inhibit-read-only t))
     (delete-region (point-min) (point-max))
     (dolist (buffer (w3m-list-buffers))
       (put-text-property (point)
 			 (progn
-			   (insert (w3m-buffer-title buffer) "\n")
+			   (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")
@@ -8401,6 +10676,7 @@
     (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)))
 
@@ -8441,19 +10717,19 @@
 	truncate-lines t
 	buffer-read-only t)
   (use-local-map w3m-select-buffer-mode-map)
-  (run-hooks 'w3m-select-buffer-mode-hook))
+  (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 ((buffer-read-only nil))
+  (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 (line-beginning-position) 'w3m-select-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."
@@ -8481,9 +10757,7 @@
       (save-selected-window
 	(pop-to-buffer buffer)
 	(w3m-scroll-up-or-next-url nil)))
-    ;; FIXME: we should use a hook variable for this, maybe.
-    (w3m-static-when (boundp 'header-line-format)
-      (w3m-force-window-update w3m-select-buffer-window))
+    (w3m-force-window-update w3m-select-buffer-window)
     (w3m-message w3m-select-buffer-message)
     buffer))
 
@@ -8538,6 +10812,7 @@
     (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))
@@ -8569,7 +10844,7 @@
   "Show the buffer on the menu and switch to the buffer."
   (interactive)
   (pop-to-buffer (w3m-select-buffer-show-this-line))
-  (w3m-message ""))
+  (message nil))
 
 (defun w3m-select-buffer-show-this-line-and-quit ()
   "Show the buffer on the menu and quit the buffers selection."
@@ -8605,35 +10880,46 @@
   :group 'w3m
   :type 'boolean)
 
-(defface w3m-header-line-location-title-face
+(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-face
+(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 Emacs 21 and later.
+    ;; 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)
-		 (< emacs-major-version 21)
 		 (w3m-use-tab-p))
 	     w3m-use-header-line
 	     w3m-current-url
@@ -8645,20 +10931,18 @@
 					   (ct " [T]")
 					   (charset " [C]")
 					   (t "")))))
-    (w3m-add-text-properties (point-min) (point)
-			     `(face w3m-header-line-location-title-face))
+    (w3m-add-face-property (point-min) (point) 'w3m-header-line-location-title)
     (let ((start (point)))
-      (insert w3m-current-url)
+      (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
+					"%\\([2-9a-f][0-9a-f]\\)"))))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
       (w3m-add-text-properties start (point)
-			       `(face
-				 w3m-header-line-location-content-face
-				 mouse-face
-				 highlight
-				 ,(if (or (featurep 'xemacs)
-					  (>= emacs-major-version 21))
-				      'keymap
-				    'local-map)
-				 ,w3m-header-line-map
+			       `(mouse-face highlight
+				 keymap ,w3m-header-line-map
 				 ,@(if (featurep 'xemacs)
 				       '(help-echo
 					 "button2 prompts to input URL"
@@ -8674,90 +10958,90 @@
 			       (frame-width)
 			     (window-width))
 			   (current-column) 1)))
-      (w3m-add-text-properties start (point)
-			       '(face w3m-header-line-location-content-face))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
       (unless (eolp)
 	(insert "\n")))))
 
-
 ;;; w3m-minor-mode
-(defvar w3m-goto-article-function nil
-  "Function to visit an article pointed by a given URL.
-A function set to this variable must accept an URL, and must return
-non-nil when an article pointed by the URL is found.")
+(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 ()
+(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' without three
-differences: (1) this command accepts no arguments, (2) this command
-does not handle forms, and (3) this command does not consider URL-like
-strings under the cursor.  When a unsecure page which may contain
-vicious forms is viewed, this command should be used instead of
-`w3m-view-this-url'.
-
-Note that this command depends on the value of `w3m-safe-url-regexp'
-\(which see) to consider whether the URL is safe.  You need to keep in
-mind that there may be pages which cause security problems.
+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)
+  (interactive "P")
   (let ((w3m-pop-up-windows nil)
-	(url (w3m-url-valid (w3m-anchor))))
+	(url (w3m-url-valid (w3m-anchor)))
+	safe-regexp)
     (cond
-     (url (or (when (fboundp w3m-goto-article-function)
-		(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))))
+     (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 (w3m-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)
-	  (w3m-toggle-inline-image)
+	  (if (w3m-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)
-  (w3m-safe-view-this-url))
-
-(defun w3m-safe-toggle-inline-image (&optional force no-cache)
-  "Toggle the visibility of an image under point.
-This function is mostly equivalent to `w3m-toggle-inline-image', but
-the value of `w3m-safe-url-regexp' is bound to \"\\\\`cid:\" while
-displaying an image.  You can invalidate it (treat as nil) by
-specifying the prefix argument if you don't mind it may cause a
-security problem."
-  (interactive "P")
-  (let ((w3m-safe-url-regexp (unless (and force
-					  (yes-or-no-p "\
-Are you sure you really want to show this image (maybe unsecure)? "))
-			       "\\`cid:")))
-    (w3m-toggle-inline-image force no-cache)))
-
-(defun w3m-safe-toggle-inline-images (&optional force no-cache)
-  "Toggle the visibility of all images in the buffer.
-This function is mostly equivalent to `w3m-toggle-inline-images', but
-the value of `w3m-safe-url-regexp' is bound to \"\\\\`cid:\" while
-displaying images.  You can invalidate it (treat as nil) by specifying
-the prefix argument if you don't mind it may cause a security problem."
-  (interactive "P")
-  (let ((w3m-safe-url-regexp (unless (and force
-					  (yes-or-no-p "\
-Are you sure you really want to show all images (maybe unsecure)? "))
-			       "\\`cid:")))
-    (w3m-toggle-inline-images force no-cache)))
+  (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-safe-toggle-inline-image)
-    (w3m-toggle-inline-images . w3m-safe-toggle-inline-images)
+    (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))
@@ -8805,14 +11089,33 @@
 		(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))))))
+
+(defun w3m-show-form-hint ()
+  "Show sending form hint when the cursor is in a form."
+  (let ((keys (where-is-internal 'w3m-submit-form)))
+    (when (and (w3m-submit (point)) keys)
+      (w3m-message "Press %s to send the current form."
+		   (key-description (car keys))))))
 
 (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))
+  (when w3m-init-file
+    (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
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3m.el.orig /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m.el.orig
--- work/emacs-w3m-1.4.4/w3m.el.orig	2005-03-25 09:00:00.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3m.el.orig	2013-05-30 16:59:52.000000000 +0900
@@ -1,7 +1,6 @@
-;;; w3m.el --- an Emacs interface to w3m
+;;; w3m.el --- an Emacs interface to w3m -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
-;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2000-2013 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Authors: TSUCHIYA Masatoshi <tsuchiya@namazu.org>,
 ;;          Shun-ichi GOTO     <gotoh@taiyo.co.jp>,
@@ -11,7 +10,7 @@
 ;;          Yuuichi Teranishi  <teranisi@gohome.org>,
 ;;          Akihiro Arisawa    <ari@mbf.sphere.ne.jp>,
 ;;          Katsumi Yamaoka    <yamaoka@jpl.org>,
-;;          Tsuyoshi CHO       <mfalcon_sky@emailuser.net>
+;;          Tsuyoshi CHO       <tsuyoshi_cho@ybb.ne.jp>
 ;; Keywords: w3m, WWW, hypermedia
 
 ;; This file is the main part of emacs-w3m.
@@ -27,9 +26,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; 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:
@@ -51,12 +50,13 @@
 
 ;;; Code:
 
-;; Developers, you must not use the cl functions (e.g., `butlast',
-;; `coerce', `merge', etc.) in any emacs-w3m or shimbun modules.  To
+;; 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 or w3m-om.el.
+;; 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))
 
@@ -79,7 +79,7 @@
 (require 'w3m-util)
 (require 'w3m-proc)
 
-;; Silence the Emacs' byte-compiler that says ``might not be defined''.
+;; Silence the Emacs's byte-compiler that says ``might not be defined''.
 (eval-when-compile
   (defalias 'w3m-setup-menu 'ignore))
 
@@ -87,51 +87,39 @@
   (cond
    ((featurep 'xemacs)
     (require 'w3m-xmas))
-   ((>= emacs-major-version 23)
-    ;; Emacs-w3m of the released version does not support Emacs 23+.
-    ;; We load w3m-e23.el(c) that exists in the same directory as
-    ;; w3m.el(c) so as to exclude ones in other places.
-    (unless (featurep 'w3m-e23)
-      (let ((files (list (and (boundp 'byte-compile-current-file)
-			      (symbol-value 'byte-compile-current-file))
-			 (and (boundp 'load-file-name)
-			      (symbol-value 'load-file-name))
-			 (locate-library "w3m")))
-	    file)
-	(while files
-	  (when (stringp (setq file (pop files)))
-	    (if (condition-case nil
-		    ;; `load' returns t if the file exists.
-		    (load (expand-file-name "w3m-e23"
-					    (file-name-directory file))
-			  nil t)
-		  (error nil))
-		(setq files nil)
-	      (unless files
-		(error "Emacs-w3m of this version does not support Emacs %d;\
- try the development version"
-		       emacs-major-version))))))))
    ((>= emacs-major-version 21)
-    (require 'w3m-e21))
-   ((= emacs-major-version 20)
-    (require 'w3m-e20))
-   ((boundp 'MULE)
-    (require 'w3m-om))
+    (require 'w3m-ems))
    (t
-    (require 'w3m-e19))))
+    (error "Emacs-w3m of this version no longer supports Emacs %s"
+	   (mapconcat 'identity
+		      (nbutlast (split-string emacs-version "\\."))
+		      ".")))))
 
+(unless (or (featurep 'xemacs) (< emacs-major-version 23))
+  (require 'bookmark-w3m))
+
+(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" nil t)
+  (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 link address of the current page to the bookmark." t)
+    "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)
@@ -158,6 +146,7 @@
   (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")
@@ -166,17 +155,65 @@
   (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 'widget-forward "wid-edit" nil t))
+  (autoload 'w3m-mail "w3m-mail" nil t)
+  (autoload 'w3m-lnum-mode "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-follow "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-goto "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-universal "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-toggle-inline-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-view-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-external-view-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-edit-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-print-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-download-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-bookmark-add-this-url "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-zoom-in-image "w3m-lnum" nil t)
+  (autoload 'w3m-lnum-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)))
+    (defalias 'char-to-int 'identity))
+  (defvar bidi-paragraph-direction)
+  (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 "1.4.4"
+(defconst emacs-w3m-version
+  (eval-when-compile
+    (let ((rev "$Revision: 1.1600 $"))
+      (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
@@ -203,6 +240,14 @@
   :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'.")
@@ -229,22 +274,20 @@
 	  (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)
+\\(?:\\.[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 9) 'w3mmee)
-		   ((match-beginning 8) 'w3m-m17n)
+		   ((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)
-				     (save-excursion (end-of-line)
-						     (point)))
+		  (or (split-string (buffer-substring (match-end 0)
+						      (point-at-eol))
 				    ",")
 		      (list nil)))
 	    (when (member "m17n" w3m-compile-options)
@@ -267,10 +310,10 @@
   :type 'boolean)
 
 (defcustom w3m-language
-  (if (or (and (boundp 'current-language-environment)
-	       (string= "Japanese"
-			(symbol-value 'current-language-environment)))
-	  (boundp 'MULE))
+  (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
@@ -281,9 +324,9 @@
 	       (case-fold-search t))
 	   (prog1
 	       (setq value (if (string-match "\\`japan" value) "Japanese"))
-	     (set-default symbol value))))
+	     (custom-set-default symbol value))))
   :set (lambda (symbol value)
-	 (set-default symbol (if (equal value "Japanese") "Japanese"))))
+	 (custom-set-default symbol (if (equal value "Japanese") "Japanese"))))
 
 (defcustom w3m-command-arguments
   (if (eq w3m-type 'w3mmee) '("-o" "concurrent=0" "-F") nil)
@@ -300,7 +343,7 @@
 
 \(setq w3m-command-arguments-alist
       '(;; Don't use the proxy server to visit local web pages.
-	(\"^http://\\\\([^/]*\\\\.\\\\)*your-company\\\\.com\\\\(/\\\\|$\\\\)\"
+	(\"^http://\\\\(?:[^/]*\\\\.\\\\)*your-company\\\\.com\\\\(?:/\\\\|$\\\\)\"
 	 \"-no-proxy\")
 	;; Use the proxy server to visit any foreign urls.
 	(\"\"
@@ -330,7 +373,7 @@
 	 (if (eq w3m-type 'w3mmee)
 	     (cons "W3MLANG" "ja_JP.kterm"))
 	 (if (eq system-type 'windows-nt)
-	     (cons "CYGWIN" "binmode tty"))))
+	     (cons "CYGWIN" "binmode"))))
   "*Alist of environment variables for subprocesses to inherit."
   :group 'w3m
   :type '(repeat
@@ -367,9 +410,10 @@
 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."
+`display-buffer-alist' (or `special-display-buffer-names' and
+`special-display-regexps' for old Emacsen), `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)
@@ -392,6 +436,18 @@
   :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.
@@ -434,6 +490,18 @@
   :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)
@@ -488,18 +556,12 @@
    ((not (featurep 'mule)) 'iso-8859-1)
    ((eq w3m-type 'w3mmee) 'ctext)
    ((eq w3m-type 'w3m-m17n)
-    (cond
-     ((and (equal "Japanese" w3m-language)
-	   (featurep 'w3m-e21)
-	   (not (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)))
+    (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."
@@ -512,12 +574,12 @@
     (if w3m-accept-japanese-characters
 	(if w3m-use-mule-ucs
 	    'w3m-euc-japan-mule-ucs
-	  (if (featurep 'w3m-e21)
+	  (if (featurep 'w3m-ems)
 	      'w3m-euc-japan
 	    'euc-japan))
       (if w3m-use-mule-ucs
 	  'w3m-iso-latin-1-mule-ucs
-	(if (featurep 'w3m-e21)
+	(if (featurep 'w3m-ems)
 	    'w3m-iso-latin-1
 	  'iso-8859-1))))
   "*Coding system used when writing to w3m processes.
@@ -560,6 +622,39 @@
   :group 'w3m
   :type '(repeat (coding-system :format "%t: %v\n" :size 0)))
 
+(defcustom w3m-url-coding-system-alist
+  '(("\\`https?://\\(?:[^./?#]+\\.\\)+google\\(?:\\.[^./?#]+\\)+/"
+     . (lambda (url)
+	 (if (string-match "&ie=\\([^&]+\\)" url)
+	     (w3m-charset-to-coding-system (match-string 1 url)))))
+    (nil . utf-8))
+  "Alist of url regexps and coding systems used to encode url to retrieve.
+The form looks like:
+  ((\"REGEXP\" . CODING) (\"REGEXP\" . CODING)...(nil . CODING))
+
+Where REGEXP is a regular expression that matches a url.  REGEXP nil
+means any url; element of which the car is nil, that is the default,
+has to be the last item of this alist.
+CODING is a coding system used to encode a url that REGEXP matches.
+CODING nil means using the coding system corresponding to a charset
+used to encode the current page.  CODING may also be a function that
+takes one argument URL and returns a coding system.
+
+If the example.com site requires a browser to use `shift_jis' to encode
+url for example, you can add it to this variable as follows:
+
+\(add-to-list
+ 'w3m-url-coding-system-alist
+ '(\"\\\\`https?://\\\\(?:[^./?#]+\\\\.\\\\)*example\\\\.com/\" . shift_jis))"
+  :group 'w3m
+  :type '(repeat (cons :format "%v" :indent 2
+		       (radio :format "%v"
+			      (const :format "Any " nil)
+			      regexp)
+		       (radio :format "%v"
+			      (const :format "Page's coding system " nil)
+			      coding-system))))
+
 (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
@@ -572,8 +667,7 @@
   ;; should never use CL macros like `caaaar', `when', `unless' ...
   :set (lambda (symbol value)
 	 (prog1
-	     ;; XEmacs 21.4.8 or Emacs 19 don't have `custom-set-default'.
-	     (set-default symbol value)
+	     (custom-set-default symbol value)
 	   (if (or noninteractive
 		   ;; Loading w3m.elc is just in progress...
 		   (not (featurep 'w3m)))
@@ -589,7 +683,7 @@
 					w3m-lynx-like-map)
 			 w3m-minor-mode-map (w3m-make-minor-mode-keymap))))
 	     (let ((buffers (buffer-list)))
-	       (save-excursion
+	       (save-current-buffer
 		 (while buffers
 		   (set-buffer (car buffers))
 		   (if (eq major-mode 'w3m-mode)
@@ -620,13 +714,13 @@
 (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.
+instead.  Nil means no init file will be loaded.
 
 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))
+  :type '(radio file (const :format "None " nil)))
 
 (defcustom w3m-default-save-directory
   (concat "~/." (file-name-sans-extension
@@ -635,6 +729,27 @@
   :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)
@@ -756,21 +871,17 @@
   "*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 '(list :convert-widget
-	       (lambda (widget)
-		 `(radio :args
-			 ,(append
-			   (if (getenv "HTTP_HOME")
-			       (list (list 'const
-					   :format "HTTP_HOME: \"%v\"\n"
-					   (getenv "HTTP_HOME"))))
-			   (if (getenv "WWW_HOME")
-			       (list (list '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)))))))
+  :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)
@@ -820,35 +931,52 @@
   :group 'w3m
   :type '(integer :size 0))
 
-(defface w3m-anchor-face
+(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-face
+(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-face
+(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-face
+(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-history-current-url-face
+(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' face,
+  ;; `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)
@@ -859,9 +987,8 @@
 	;; require `font' in Emacs/w3 and `cl' arbitrarily. :-/
 	(features (cons 'font features))
 	base-attributes attributes attribute)
-    (require 'wid-edit) ;; Needed only in Emacs 20.
     (setq base-attributes (funcall fn base nil)
-	  attributes (funcall fn 'w3m-arrived-anchor-face nil))
+	  attributes (funcall fn 'w3m-arrived-anchor nil))
     (while base-attributes
       (setq attribute (car base-attributes))
       (unless (memq attribute '(:foreground :underline))
@@ -871,26 +998,50 @@
     (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-face `((t (,@w3m-default-face-colors :bold t)))
+(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-face `((t (,@w3m-default-face-colors :underline t)))
+(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-face
-  `((t (,@w3m-default-face-colors ,(if (featurep 'xemacs)
-				       :strikethru
-				     :strike-through)
-				  t)))
+(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)
 
-(defvar w3m-fontify-strike-through (or (featurep 'w3m-e21)
-				       (featurep 'w3m-xmas))
-  "Non-nil means use `strike-through' attribute to display deleted text.")
+(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.
@@ -922,6 +1073,7 @@
 
 (defcustom w3m-after-cursor-move-hook
   '(w3m-highlight-current-anchor
+    w3m-show-form-hint
     w3m-print-this-url
     w3m-auto-show)
   "*Hook run each time after the cursor moves in emacs-w3m buffers.
@@ -948,7 +1100,7 @@
   :group 'w3m
   :type 'boolean)
 
-;; As far as we know, Emacs 20/21 under Mac OS X[1] and XEmacs under
+;; 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
@@ -965,6 +1117,17 @@
   :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
@@ -989,15 +1152,33 @@
 	  (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
-		       ((fboundp 'browse-url-default-browser)
-			'browse-url-default-browser)
-		       ((fboundp 'browse-url-netscape)
-			'browse-url-netscape))
-		    (symbol-value 'browse-url-browser-function)))
+		  (let ((default
+			  (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))))
+		    (if (or (not (boundp 'browse-url-browser-function))
+			    (eq 'w3m-browse-url
+				(symbol-value 'browse-url-browser-function)))
+			default
+		      (if (functionp browse-url-browser-function)
+			  (symbol-value 'browse-url-browser-function)
+			(catch 'browser
+			  (let ((alist browse-url-browser-function))
+			    (while alist
+			      (when (string-match (caar alist) "index.html")
+				(throw 'browser (cdar alist)))
+			      (setq alist (cdr alist)))
+			    (message "Found no html handler in \
+browse-url-browser-function to put in w3m-content-type-alist.")
+			    default))))))
 		(when (w3m-which-command "netscape")
 		  (list "netscape" 'url)))))
 	 (image-viewer (or fiber-viewer
@@ -1006,6 +1187,10 @@
 	 (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))
@@ -1015,8 +1200,9 @@
 			  ((w3m-which-command "xpdf") (list "xpdf" 'file))
 			  ((w3m-which-command "acroread")
 			   (list "acroread" 'file))))))
-    `(("text/plain" "\\.\\(txt\\|tex\\|el\\)\\'" nil nil)
+    `(("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)
@@ -1028,13 +1214,36 @@
       ("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/xml" "\\.xml\\'" nil "text/plain")
+      ("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 file suffixes and content types."
+  "*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
@@ -1178,12 +1387,32 @@
   :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
@@ -1191,19 +1420,20 @@
 
 (defcustom w3m-use-filter nil
   "*Non-nil means use filter programs to convert web contents.
-See also `w3m-filter-rules'."
+See also `w3m-filter-configuration'."
   :group 'w3m
   :type 'boolean
   :require 'w3m-filter)
 
 (defcustom w3m-use-symbol
-  (and (featurep 'mule)
-       (eq w3m-type 'w3m-m17n)
-       (or (not (eq w3m-output-coding-system 'utf-8))
-	   (and (w3m-mule-unicode-p)
-		(>= emacs-major-version 21)
-		(or window-system (eq (terminal-coding-system) 'utf-8))))
-       t)
+  (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."
@@ -1227,7 +1457,7 @@
 (defcustom w3m-edit-function-alist
   '(("\\`[^?]+/hiki\\.cgi\\?" . hiki-edit-url))
   "*Alist of functions used for editing pages.
-This option is refered to decide which function shouled be used to
+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."
@@ -1256,8 +1486,7 @@
 
 (defcustom w3m-track-mouse t
   "*Whether to track the mouse and message the url under the mouse.
-This feature does not work under Emacs or XEmacs versions prior to 21.
-See also `show-help-function' if you are using Emacs 21 or later.
+See also `show-help-function' if you are using GNU Emacs.
 
 A tip for XEmacs users:
 
@@ -1283,99 +1512,49 @@
   :group 'w3m
   :type 'boolean)
 
-(defcustom w3m-show-decoded-url
-  '(("\\`http://\\([^./?#]+\\.\\)*wikipedia\\.org/" . 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 ;; ??
-					(or (and (< emacs-major-version 21)
-						 (not 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"
-		     (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.
-Unfortunately, users of Emacs 20 and less cannot enjoy the benefit.
 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,
@@ -1386,6 +1565,19 @@
   :group 'w3m
   :type 'boolean)
 
+(defcustom w3m-new-session-url "about:blank"
+  "*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'
@@ -1396,20 +1588,18 @@
   :group 'w3m
   :type 'boolean)
 
-(defcustom w3m-use-favicon (featurep 'w3m-image)
+(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)
-	      (featurep 'w3m-image)
 	      (w3m-favicon-usable-p)))
   :set (lambda (symbol value)
-	 (set-default symbol (and (not noninteractive)
-				  value
-				  (featurep 'w3m-image)
-				  (w3m-favicon-usable-p))))
+	 (custom-set-default symbol (and (not noninteractive)
+					 value
+					 (w3m-favicon-usable-p))))
   :group 'w3m
   :type 'boolean)
 
@@ -1419,7 +1609,7 @@
 `w3m-use-favicon' is non-nil."
   :set (lambda (symbol value)
 	 (prog1
-	     (set-default symbol value)
+	     (custom-set-default symbol value)
 	   (if (and (not noninteractive)
 		    ;; Make sure it is not the first time.
 		    (featurep 'w3m)
@@ -1456,18 +1646,20 @@
   :type 'boolean)
 
 (defcustom w3m-view-this-url-new-session-in-background nil
-  "Run `w3m-view-this-url' without switching to the newly created buffer.
-It is useful if you enabled the tabs line or the buffers selection
-window for the `w3m-select-buffer' feature.  Note that it is meaningful
-only when specifying a prefix argument to the `w3m-view-this-url'
-command or using the `w3m-view-this-url-new-session' command in order
-to create a new emacs-w3m session."
+  "*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."
+It allows not only the alist form but also XEmacs's plist form."
   :group 'w3m
   :type '(choice (group :inline t :tag "Frame Parameters (Emacs)"
 			(repeat :inline t :tag "Frame Parameters (Emacs)"
@@ -1513,9 +1705,9 @@
   :group 'w3m
   :type '(integer :size 0)
   :set (lambda (symbol value)
-	 (set-default symbol (if (and (integerp value) (> value 1))
-				 value
-			       4))))
+	 (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.
@@ -1538,17 +1730,45 @@
   :group 'w3m
   :type '(string :size 0))
 
-(defcustom w3m-local-find-file-regexps '(nil . "\\.html?\\'")
+(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 . \"\\\\.html?\\\\'\")' allows
+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.
+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."
@@ -1593,22 +1813,22 @@
   "*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)))))))))
+  :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\\)/"))
+    (cons "\\`http:" "\\`http://\\(?:localhost\\|127\\.0\\.0\\.1\\)/"))
   "*Rule of sending referers.
 There are five choices as the valid values of this option.
 
@@ -1632,7 +1852,7 @@
 
 \(setq w3m-add-referer
       '(\"\\\\`http:\"
-	. \"\\\\`http://\\\\([^./]+\\\\.\\\\)*example\\\\.net/\")\)
+	. \"\\\\`http://\\\\(?:[^./]+\\\\.\\\\)*example\\\\.net/\")\)
 "
   :group 'w3m
   :type '(choice
@@ -1658,6 +1878,18 @@
   :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")
@@ -1666,6 +1898,7 @@
     ("\\`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.
@@ -1695,248 +1928,287 @@
 "
   :group 'w3m
   :type '(repeat
-	  (list
-	   :convert-widget
-	   (lambda (widget)
-	     (require 'w3m-search)
-	     (list
-	      'choice :format "%[Value Menu%] %v" :tag "Replacing URI with"
-	      :args
-	      (append
-	       '((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 "")))
-	       (mapcar
-		(lambda (elem)
-		  (let ((engine (car elem))
-			prefix)
-		    (setq prefix (mapconcat 'identity
-					    (split-string (downcase engine))
-					    "-"))
-		    (list 'list
-			  :format "Quick Search:\n%v"
-			  :tag (concat "Quick Search: " prefix)
-			  (list 'regexp
-				:tag "Prefix URL Regexp"
-				(concat "\\`" (regexp-quote prefix) ":"))
-			  '(function-item :format "" w3m-search-uri-replace)
-			  (list '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
-			;; Fixing 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))))))))))
+	  :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\\|groups\\)\\.google\\.[^/]+/\\(search\\|groups\\)"
+     "\\`https?://\\(?: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>\\(?:下一頁\\|次へ\\|�4Y@=\\)</b>\\)")
+     ,(concat "<a[^>]+?href=" w3m-html-string-regexp "[^>]*>[\t\n ]*"
+	      "\\(?:\\(?:</?span[^>]*>[\t\n ]*\\)*<span[^>]+>Previous</span>"
+	      "\\|\\(?:</?span[^>]*>[\t\n ]*\\)*"
+	      "<b>\\(?:上一頁\\|前へ\\|�@L@|\\)</b>\\)")
+     nil nil)
+    (w3m-relationship-simple-estimate
+     "\\`https?://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=/\\(intl/[^/]+/\\)?nav_next\\.gif")
+	      "><img src=http://i\\.yimg\\.jp/images/common/ar_next\\.gif")
      ,(concat "<a href=" w3m-html-string-regexp
-	      "><img src=/\\(intl/[^/]+/\\)?nav_previous\\.gif")
+	      "><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 ">次のページ</a>")
      ,(concat "<a href=" w3m-html-string-regexp ">前のページ</a>")
      nil nil)
-    (w3m-relationship-magicpoint-estimate))
+    (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
-	   (group :tag "Estimate relationships from anchors matching"
-		 (function :format "" w3m-relationship-simple-estimate)
+	   :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 "Previous")
-		 (regexp :tag "Start")
-		 (regexp :tag "Contents"))
+		 (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 "Arguments" sexp)))))
+		 (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)
 
-(defconst w3m-entity-alist
-  (append
-   (eval-when-compile
-     (let ((basic-entity-alist
-	    '(("nbsp" . " ")
-	      ("gt" . ">")
-	      ("lt" . "<")
-	      ("amp" . "&")
-	      ("quot" . "\"")
-	      ("apos" . "'")
-	      ("circ" . "^")
-	      ("tilde" . "~")))
-	   (latin1-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)))
-	   (greek-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))))
-       (append basic-entity-alist
-	       ;; latin1
-	       (mapcar
-		(lambda (entity)
-		  (cons (car entity)
-			(char-to-string
-			 (make-char (w3m-static-if (boundp 'MULE)
-					lc-ltn1
-				      'latin-iso8859-1)
-				    (cdr entity)))))
-		latin1-entity)
-	       ;; greek
-	       (mapcar
-		(lambda (entity)
-		  (cons (car entity)
-			(char-to-string
-			 (make-char (w3m-static-if (boundp 'MULE)
-					lc-grk
-				      'greek-iso8859-7)
-				    (cdr entity)))))
-		greek-entity))))
-   (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)))))
-       (append
-	(apply 'append
-	       (mapcar
-		(lambda (entities)
-		  (let ((code1 (car entities)))
-		    (mapcar
-		     (lambda (entity)
-		       (cons (car entity)
-			     (char-to-string
-			      (make-char 'mule-unicode-0100-24ff
-					 code1 (cdr entity)))))
-		     (cdr entities))))
-		`(,@latin-extended-a ,@latin-extended-b ,@general-punctuation
-		  ,@greek ,@letterlike-symbols ,@arrows
-		  ,@mathematical-operators ,@miscellaneous-technical)))
-	(mapcar
-	 (lambda (entity)
-	   (cons (car entity)
-		 (char-to-string
-		  (make-char 'mule-unicode-2500-33ff
-			     (car (cdr entity)) (cdr (cdr entity))))))
-	 suit)))))
-  "Alist of html character entities and values.")
+(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
-  "&\\([a-z][a-z0-9]*\\|#[0-9]+\\|#x[0-9a-f]+\\)\\(;\\)?"
+  (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.")
 
-(defvar w3m-entity-db nil
-  "Hash table of `w3m-entity-alist'.
-The nil value means it has not been initialized.")
-
-(defconst w3m-entity-db-size 13 "Size of `w3m-entity-db'.")
-
 (defconst w3m-encoding-alist
   (eval-when-compile
     (apply 'nconc
@@ -1950,18 +2222,29 @@
 Decoders are specified by `w3m-decoder-alist' (which see).")
 
 (defconst w3m-emacs-w3m-icon "\
-R0lGODlhUwAOAPIFAP///38AvwAAv1Uq/AC/AL9/Af8AAAAAACH/C05FVFNDQVBFMi4wAwEA
-AAAh+QQEIQD/ACwAAAAAUwAOAEADwgi63P4wykldCBYDIRT33RYOQ0ScU1EAKrs2hqHEswzQ
-ynUte78vnA9DQGKQihIUQNliNGlQXGVKrVqv2Oy06Zr+vpqfcDgqAZDHCvPVVHFxcJsOAAbZ
-RWdkfn9GKSVtbC83NnE1WoiIblyJjY4KXIwSdXQ+GEKYIXtoZnoPa5CDoTUyMaVyOpRimkFC
-ngtHZksntAQKBCstkiyFvYeVGXeZCpzEsgt/EYGjv4aEPHPCIWNEJXppyLQVy6RSzlKP4eIJ
-ACH5BAQhAP8ALAAAAAABAAEAAAMCCAkAIfkEBCEA/wAsAQABAFEACwAAAx0Iutz+MMpJq704
-6827/2AojmRpnmiqrmzrvnBsJgAh+QQEIQD/ACwBAAQAEQAIAAADHAixAb6qMRgfZDbXHaem
-nBOKINmIpnSWqIe+TgIAIfkEBCEA/wAsCQAEABcACAAAAykYAcoNUEgBq1ALAxnp9tXzcFVX
-OtAITmS4fCYsuzHZnqhsg/geb7hKAgAh+QQEIQD/ACwXAAQAFAAIAAADJSgKzDKjAQjbYrXO
-uJ3AnEZZytdJoAZcKuqKIeduchaidjPOQAIAIfkEBCEA/wAsJgAEABUACAAAAyA4OtD+gJAm
-GVAQyodz3s5iRVI5RR/ordTJapP6OuacJQAh+QQEIQD/ACw2AAEAEAALAAADJgi6XO4sAqio
-nGU5ogjH0VZlYFN8VPoARAZZGviSlzpKdmneF5AAADs="
+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
@@ -1973,6 +2256,22 @@
   :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 \"^https?://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.")
@@ -1998,13 +2297,11 @@
 
 (defvar w3m-modeline-favicon nil
   "Modeline control for displaying a favicon.
-This variable will be made buffer-local under Emacs 21 and later or
-XEmacs.")
+This variable will be made buffer-local.")
 
 (defvar w3m-favicon-image nil
   "Favicon image of the page.
-This variable will be made buffer-local under Emacs 21 and later or
-XEmacs.")
+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.
@@ -2017,6 +2314,14 @@
 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
@@ -2042,6 +2347,8 @@
   "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)
@@ -2057,8 +2364,9 @@
 (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)
 
-(defsubst w3m-clear-local-variables ()
+(defun w3m-clear-local-variables ()
   (setq w3m-current-url nil
 	w3m-current-base-url nil
 	w3m-current-title nil
@@ -2071,9 +2379,10 @@
 	w3m-contents-url nil
 	w3m-max-anchor-sequence nil
 	w3m-current-refresh nil
-	w3m-current-ssl nil))
+	w3m-current-ssl nil
+	w3m-name-anchor-from-hist nil))
 
-(defsubst w3m-copy-local-variables (from-buffer)
+(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
@@ -2109,7 +2418,17 @@
 only in the echo area.")
 
 (defvar w3m-safe-url-regexp nil
-  "Regexp matching urls which are considered to be safe.")
+  "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)
@@ -2117,6 +2436,33 @@
 (defvar w3m-cache-hashtb nil)
 (defvar w3m-input-url-history nil)
 
+(defvar w3m-http-status-alist
+  '((400 . "Bad Request")
+    (401 . "Unauthorized")
+    (402 . "Payment Required")
+    (403 . "Forbidden")
+    (404 . "Not Found")
+    (405 . "Method Not Allowed")
+    (406 . "Not Acceptable")
+    (407 . "Proxy Authentication Required")
+    (408 . "Request Time-out")
+    (409 . "Conflict")
+    (410 . "Gone")
+    (411 . "Length Required")
+    (412 . "Precondition Failed")
+    (413 . "Request Entity Too Large")
+    (414 . "Request-URI Too Large")
+    (415 . "Unsupported Media Type")
+    (500 . "Internal Server Error")
+    (501 . "Not Implemented")
+    (502 . "Bad Gateway")
+    (503 . "Service Unavailable")
+    (504 . "Gateway Time-out")
+    (505 . "HTTP Version not supported"))
+  "Alist of HTTP status codes.")
+
+(defvar w3m-http-status nil)
+
 (defconst w3m-arrived-db-size 1023)
 (defvar w3m-arrived-db nil
   "Hash table, the arrived URLs database.
@@ -2135,9 +2481,10 @@
   '(("image/jpeg" . jpeg)
     ("image/gif" . gif)
     ("image/png" . png)
+    ("image/tiff" . tiff)
     ("image/x-xbm" . xbm)
     ("image/x-xpm" . xpm))
-  "Alist of content types and image types defined as the Emacs' features.")
+  "Alist of content types and image types defined as the Emacs's features.")
 
 (defconst w3m-toolbar-buttons
   '("back" "parent" "forward" "reload" "open" "home" "search" "image"
@@ -2146,7 +2493,7 @@
 
 (defconst w3m-toolbar
   (if (equal "Japanese" w3m-language)
-      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)));;ア
+      (let ((a (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp))) ;; ア
 	`([w3m-toolbar-back-icon w3m-view-previous-page
 				 (w3m-history-previous-link-available-p)
 				 "前のページに戻る"]
@@ -2199,63 +2546,133 @@
 ;; "View" is page viewing
 ;; "Show" is link list showing
 (defconst w3m-menubar
-  '("w3m"
-    ("Session"
-     ["Create New Session..." w3m-goto-url-new-session t]
-     ["Copy This Session" w3m-copy-buffer t]
-     "----" ;; separator
-     ["Move Previous Session" w3m-previous-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     ["Move Next Session" w3m-next-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     "----" ;; separator
-     ["Close This Session" w3m-delete-buffer
-      (> (safe-length (w3m-list-buffers)) 1)]
-     ) ;; end session
-    ["Download This URL" w3m-download-this-url t]
-    ["Download to..." w3m-download t]
-    "----" ;; separator
-    ["Back to Previous Page" w3m-view-previous-page
+  (let ((a (when w3m-use-japanese-menu
+	     (decode-coding-string "\e$B%\"\e(B" 'iso-2022-jp)))) ;; ア
+    `("w3m"
+      [,(w3m-make-menu-item "この URL を新しいセッションで開く"
+	  "Open This URL in a new session")
+       w3m-view-this-url-new-session (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "この URL をダウンロードする" "Download This URL")
+       w3m-download-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "ダウンロード..." "Download to...")
+       w3m-download t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "前のページに戻る" "Back to Previous Page")
+       w3m-view-previous-page
+       (w3m-history-previous-link-available-p)]
+      [,(w3m-make-menu-item "次のページに移動する" "Forward to Next Page")
+       w3m-view-next-page
+       (w3m-history-next-link-available-p)]
+      [,(w3m-make-menu-item "上の階層に移動する" "Up to Parent Page")
+       w3m-view-parent-page
+       (w3m-parent-page-available-p)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "このページを外部ブラウザで開く"
+	  "Open This Page in an External Browser")
+       w3m-external-view-current-url w3m-current-url]
+      [,(w3m-make-menu-item "この URL を外部ブラウザで開く"
+	  "Open This URL in an External Browser")
+       w3m-external-view-this-url (or (w3m-anchor) (w3m-image))]
+      [,(w3m-make-menu-item "このページのソースをコマンドに送る..."
+	  "Pipe Page Source to Command...")
+       w3m-pipe-source  w3m-current-url]
+      "----" ;; separator
+      (,(w3m-make-menu-item "再表示" "Redisplay")
+       [,(w3m-make-menu-item "このページを再取得する" "Reload This Page")
+	w3m-reload-this-page w3m-current-url]
+       [,(w3m-make-menu-item "すべてのページを再取得する" "Reload All Pages")
+       w3m-reload-all-pages (cdr (w3m-list-buffers))]
+       "----" ;; separator
+       [,(w3m-make-menu-item "画像表示の切替(全部)" "Toggle Images")
+	w3m-toggle-inline-images (w3m-display-graphic-p)]
+       [,(w3m-make-menu-item "画像表示の切替(この画像)" "Toggle This Image")
+	w3m-toggle-inline-image (w3m-image)]
+       [,(w3m-make-menu-item "画像表示を止める" "Turn off Images")
+	w3m-turnoff-inline-images (w3m-display-graphic-p)]
+       "----" ;; separator
+       [,(w3m-make-menu-item "再描画する" "Redisplay This Page")
+	w3m-redisplay-this-page w3m-current-url]
+       [,(w3m-make-menu-item "Charset を指定して再描画する"
+	   "Redisplay This Page with Charset")
+	w3m-redisplay-with-charset w3m-current-url]
+       [,(w3m-make-menu-item "Content-type を指定して再描画する"
+	   "Redisplay This Page with Content-type")
+	w3m-redisplay-with-content-type w3m-current-url]
+       [,(w3m-make-menu-item "指定した Charset と Content-type を破棄する"
+	   "Reset Charset and Content-type")
+	w3m-redisplay-and-reset w3m-current-url]
+       ) ;; end redisplay
+      [,(w3m-make-menu-item "ホームページへ移動" "Go to Home Page")
+       w3m-gohome w3m-home-page]
+      (,(w3m-make-menu-item "ブックマーク" "Bookmark")
+       [,(w3m-make-menu-item "ブックマークを表示" "View Bookmark")
+	w3m-bookmark-view t]
+       [,(w3m-make-menu-item "新しいセッションでブックマークを表示"
+			     "View Bookmark in a New Session")
+	w3m-bookmark-view-new-session t])
+      [,(w3m-make-menu-item "移動..." "Go to...")
+       w3m-goto-url t]
+      "----" ;; separator
+      (,(w3m-make-menu-item "履歴" "History")
+       [,(w3m-make-menu-item "木構造で履歴を表示" "Show a Visited URLs Tree")
+	w3m-history t]
+       [,(w3m-make-menu-item "リストで履歴を表示" "Show an Arrived URLs List")
+	w3m-db-history t]
+       ) ;; end history
+      [,(w3m-make-menu-item "インターネットでの検索..."
+			    "Search the Internet...")
+       w3m-search t]
+      [,(w3m-make-menu-item "新しいセッションで検索..."
+			    "Search the Internet in a New Session...")
+       w3m-search-new-session t]
+      [,(w3m-make-menu-item "天気予報" "Weather Forecast")
+       w3m-weather t]
+      [,(w3m-make-menu-item (concat a "ンテナで取得")
+			    "Investigate with Antenna")
+       w3m-antenna t]
+      (,(w3m-make-menu-item "ヘルプ" "Resource")
+       [,(w3m-make-menu-item "プロセスを中止する" "Cancel Process")
+	w3m-process-stop w3m-current-process]
+       [,(w3m-make-menu-item "ソースを見る" "View Source")
+	w3m-view-source t]
+       [,(w3m-make-menu-item "ヘッダーを見る" "View Header")
+	w3m-view-header t]
+       ) ;; end resource
+      "----" ;; separator
+      [,(w3m-make-menu-item "このページをメールで送る" "Mail this page")
+       w3m-mail (memq mail-user-agent w3m-mail-user-agents)]
+      "----" ;; separator
+      [,(w3m-make-menu-item "バグレポートを送る" "Send a Bug Report")
+       report-emacs-w3m-bug t]
+      "----" ;; separator
+      [,(w3m-make-menu-item "この URL を表示する" "Print the Current URL")
+       w3m-print-current-url t]
+      [,(w3m-make-menu-item "w3m を閉じる" "Close w3m")
+       w3m-close-window t]
+      [,(w3m-make-menu-item "w3m を終了する" "Quit w3m")
+       w3m-quit t]
+      )) ;; end w3m
+  "Menubar definition for emacs-w3m.")
+
+(defvar w3m-rmouse-menubar
+  `("w3m"
+    [,(w3m-make-menu-item "前のページに戻る" "Back to Previous Page")
+     w3m-view-previous-page
      (w3m-history-previous-link-available-p)]
-    ["Forward to Next Page" w3m-view-next-page
+    [,(w3m-make-menu-item "次のページに移動する" "Forward to Next Page")
+     w3m-view-next-page
      (w3m-history-next-link-available-p)]
-    ["Up to Parent Page" w3m-view-parent-page
+    [,(w3m-make-menu-item "上の階層に移動する" "Up to Parent Page")
+     w3m-view-parent-page
      (w3m-parent-page-available-p)]
-    ["Cancel Process" w3m-process-stop w3m-current-process]
-    ["Reload This Page" w3m-reload-this-page w3m-current-url]
-    ("Redisplay"
-     ["Toggle Images" w3m-toggle-inline-images (w3m-display-graphic-p)]
-     "----" ;; separator
-     ["Redisplay This Page" w3m-redisplay-this-page w3m-current-url]
-     ["Redisplay This Page with Charset"
-      w3m-redisplay-with-charset w3m-current-url]
-     ["Redisplay This Page with Content-type"
-      w3m-redisplay-with-content-type w3m-current-url]
-     ["Reset Charset and Content-type" w3m-redisplay-and-reset w3m-current-url]
-     ) ;; end redisplay
-    ["Search the Internet..." w3m-search t]
-    ["Go to Home Page" w3m-gohome w3m-home-page]
-    ["Go to..." w3m-goto-url t]
-    "----" ;; separator
-    ["View Bookmark" w3m-bookmark-view t]
-    ("History"
-     ["Show a Visited URLs Tree" w3m-history t]
-     ["Show an Arrived URLs List" w3m-db-history t]
-     )
-    ["Weather Forecast" w3m-weather t]
-    ["Investigate with Antenna" w3m-antenna t]
-    ("Resource"
-     ["View Source" w3m-view-source t]
-     ["View Header" w3m-view-header t]
-     ) ;; end resource
-    "----" ;; separator
-    ["Send a Bug Report" report-emacs-w3m-bug t]
     "----" ;; separator
-    ["Print the Current URL" w3m-print-current-url t]
-    ["Close w3m" w3m-close-window t]
-    ["Quit w3m" w3m-quit t]
-    );; end w3m
-  "Menubar definition for emacs-w3m.")
+    [,(w3m-make-menu-item "このページを再取得する" "Reload This Page")
+     w3m-reload-this-page w3m-current-url]
+    [,(w3m-make-menu-item "すべてのページを再取得する" "Reload All Pages")
+     w3m-reload-all-pages (cdr (w3m-list-buffers))]
+    [,(w3m-make-menu-item "プロセスを中止する" "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)
@@ -2264,20 +2681,6 @@
 (defconst w3m-work-buffer-name " *w3m-work*")
 (defconst w3m-select-buffer-name " *w3m buffers*")
 
-(defconst w3m-meta-content-type-charset-regexp
-  "<meta[ \t\n]+http-equiv=\"?Content-type\"?[ \t\n]+content\
-=\"?\\([^;]+\\);[ \t\n]*charset=\\([^\"]+\\)\"?[ \t\n]*/?>"
-  "Obsolete regular expression.
-This constant MUST NOT be used, because it is defined only to keep
-compatibility with old Gnus and will be removed soon.")
-
-(defconst w3m-meta-charset-content-type-regexp
-  "<meta[ \t\n]+content=\"?\\([^;]+\\);[ \t\n]*charset\
-=\\([^\"]+\\)\"?[ \t\n]+http-equiv=\"?Content-type\"?[ \t\n]*/?>"
-  "Obsolete regular expression.
-This constant MUST NOT be used, because it is defined only to keep
-compatibility with old Gnus and will be removed soon.")
-
 (defconst w3m-dump-head-source-command-arguments
   (cond ((eq w3m-type 'w3mmee)
 	 (list "-dump=extra,head,source"))
@@ -2314,42 +2717,55 @@
 	       "-o" "ucs_conv=1"
 	       '(if (eq w3m-input-coding-system 'binary)
 		    (if charset (list "-I" 'charset))
-		  (list "-I" (if (eq w3m-input-coding-system 'utf-8)
-				 "UTF-8"
-			       "ISO-2022-JP-2")))
+		  (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"
-	       '(if (eq w3m-output-coding-system 'utf-8)
-		    "UTF-8"
-		  "ISO-2022-JP-2")))
+	       '(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
-  '("-T" "text/html" "-t" tab-width "-cols" (w3m-display-width))
+  (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\\|\
+  "\\`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\\|\
+  "\\`about:\\(?://\\(?:header\\|source\\|history\\|\
 db-history\\|antenna\\|namazu\\|dtree\\)/.*\\)?\\'\
 \\|\\`about:/*blank/?\\'"
   "Regexp matching urls which aren't stored in the history.")
 
-(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.")
-
 (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'.")
@@ -2373,29 +2789,40 @@
 whose net_loc part is not empty, a null string or the localhost name
 to this function."
   (cond
-   ((string-match "\\`\\(\\(file:\\(//\\)?\\)\\|about://dtree\\)/" url)
+   ((string-match "\\`\\(\\(file:/\\{0,2\\}\\)\\|about://dtree\\)/" url)
     (setq url (substring url (match-end 1)))
-    ;; Strip the localhost name.
     (when (and (match-beginning 2) ;; file:
-	       (string-match (concat "\\`//\\(localhost\\|127\\.0\\.0\\.1\\|"
-				     (regexp-quote (system-name)) "\\)/")
-			     url))
-      (setq url (substring url (match-end 1))))
+	       (< (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.
-    (setq url
-	  (if (and w3m-treat-drive-letter
-		   (string-match
-		    "\\`/\\(\\([a-zA-Z]\\)[|:]?\\|cygdrive/\\([a-zA-Z]\\)\\)/"
-		    url))
-	      (concat (or (match-string 2 url) (match-string 3 url))
-		      ":/"
-		      (substring url (match-end 0)))
-	    url))
-    (if (file-exists-p url)
+    (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
-      (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)
+      (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)
@@ -2426,13 +2853,31 @@
 
 
 ;;; 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 (intern url w3m-arrived-db)))
+    (let ((ident (w3m-arrived-intern url)))
       (if (string-match "\\`\\([^#]+\\)#" url)
 	  (w3m-arrived-add (substring url 0 (match-end 1))
 			   title modification-time arrival-time
@@ -2447,30 +2892,30 @@
 	  (put ident 'content-type content-type)))
       (set ident arrival-time))))
 
-(defsubst w3m-arrived-p (url)
+(defun w3m-arrived-p (url)
   "Return non-nil if a page of URL has arrived."
   (or (string-match w3m-arrived-ignored-regexp url)
-      (intern-soft url w3m-arrived-db)))
+      (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 (intern-soft url w3m-arrived-db)))
+  (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))
 
-(defsubst w3m-arrived-put (url property 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 (intern-soft url w3m-arrived-db)))
+  (let ((symbol (w3m-arrived-intern url t)))
     (and symbol (put symbol property value))))
 
-(defsubst w3m-arrived-get (url property)
+(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 (intern-soft url w3m-arrived-db)))
+  (let ((symbol (w3m-arrived-intern url t)))
     (and symbol (get symbol property))))
 
 (defsetf w3m-arrived-get w3m-arrived-put)
@@ -2589,7 +3034,10 @@
     (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)
@@ -2632,6 +3080,11 @@
 	(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
@@ -2689,19 +3142,17 @@
   (if (featurep 'xemacs)
       (let ((str `(get-text-property (extent-start-position extent)
 				     ',property)))
-	`(if (>= emacs-major-version 21)
-	     (lambda (extent)
-	       (if (and w3m-track-mouse
-			(eq (extent-object extent) (current-buffer)))
-		   (w3m-url-readable-string ,str)))))
-    `(if (>= emacs-major-version 21)
-	 (lambda (window object pos)
-	   (if w3m-track-mouse
-	       (progn
-		 (w3m-message "")	; Clear the echo area.
-		 (w3m-url-readable-string
-		  (get-text-property pos ',property
-				     (window-buffer window)))))))))
+	`(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.
@@ -2727,21 +3178,39 @@
 		      (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 not in
-the minibuffer and `w3m-verbose' is nil.  When the cursor is in the
-minibuffer 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."
-  (if w3m-verbose
-      (apply (function message) args)
-    (if (eq (selected-window) (minibuffer-window))
-	(apply (function format) args)
-      (w3m-static-if (featurep 'xemacs)
-	  (display-message 'no-log (apply (function format) args))
-	(let (message-log-max)
-	  (apply (function message) args))))))
+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."
@@ -2791,13 +3260,7 @@
     (with-temp-buffer
       (when (condition-case nil
 		(let ((coding-system-for-read
-		       (or coding-system
-			   w3m-file-coding-system-for-read))
-		      (file-coding-system-for-read
-		       (or coding-system
-			   w3m-file-coding-system-for-read
-			   (if (boundp 'file-coding-system-for-read)
-			       (symbol-value 'file-coding-system-for-read)))))
+		       (or coding-system w3m-file-coding-system-for-read)))
 		  (insert-file-contents file))
 	      (error
 	       (message "Error while loading %s" file)
@@ -2819,8 +3282,7 @@
 non-nil, control chars will be represented with ^ as `cat -v' does."
   (when (and list (file-writable-p file))
     (with-temp-buffer
-      (let ((file-coding-system (or coding-system w3m-file-coding-system))
-	    (coding-system-for-write (or coding-system w3m-file-coding-system))
+      (let ((coding-system-for-write (or coding-system w3m-file-coding-system))
 	    (standard-output (current-buffer))
 	    (print-fn (if escape-ctl-chars
 			  'w3m-prin1
@@ -2861,7 +3323,25 @@
 	  (write-region (point-min) (point-max) file nil 'nomsg)
 	  (when mode (set-file-modes file mode)))))))
 
-(defun w3m-url-encode-string (str &optional coding)
+(defun w3m-url-coding-system (url)
+  "Return coding system suitable to URL to retrieve."
+  (let ((alist w3m-url-coding-system-alist)
+	(case-fold-search t)
+	elt coding)
+    (while alist
+      (setq elt (pop alist))
+      (if (or (not (car elt))
+	      (and (stringp (car elt)) (string-match (car elt) url)))
+	  (setq coding (cdr elt)
+		alist nil)))
+    (when (functionp coding)
+      (setq coding (funcall coding url)))
+    (or coding
+	w3m-current-coding-system
+	(cdr (assq nil w3m-url-coding-system-alist))
+	w3m-default-coding-system)))
+
+(defun w3m-url-encode-string (str &optional coding encode-space)
   (apply (function concat)
 	 (mapcar
 	  (lambda (ch)
@@ -2870,147 +3350,79 @@
 	      "%0D%0A")
 	     ((string-match "[-a-zA-Z0-9_:/.]" (char-to-string ch)) ; xxx?
 	      (char-to-string ch))	; printable
-	     ((char-equal ch ?\x20)	; space
+	     ((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))))
+	      (format "%%%02X" ch))))	; escape
+	  (encode-coding-string (or str "")
+				(or coding (w3m-url-coding-system str))))))
+
+(defun w3m-url-encode-string-2 (str)
+  "Encode `(' and `)', apt to be misidentified as boundaries."
+  (w3m-replace-in-string (w3m-replace-in-string str "(" "%28") ")" "%29"))
 
-(defun w3m-url-decode-string (str &optional coding)
+(defun w3m-url-decode-string (str &optional coding regexp)
+  (or regexp (setq regexp "%\\(?:\\([0-9a-f][0-9a-f]\\)\\|0d%0a\\)"))
   (let ((start 0)
-	(buf))
-    (while (string-match "+\\|%\\(0D%0A\\|\\([0-9a-fA-F][0-9a-fA-F]\\)\\)"
-			 str start)
+	(buf)
+	(case-fold-search t))
+    (while (string-match regexp str start)
       (push (substring str start (match-beginning 0)) buf)
-      (push (cond
-	     ((match-beginning 2)
-	      (vector (string-to-number (match-string 2 str) 16)))
-	     ((match-beginning 1) "\n")
-	     (t " "))
+      (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-static-if (and (featurep 'xemacs)
-			(featurep 'mule))
-	(w3m-decode-coding-string-with-priority str coding)
-      (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)))))
+    (w3m-decode-coding-string-with-priority str coding)))
 
 (defun w3m-url-readable-string (url)
-  "Return a readable string for a give encoded URL.
-If `w3m-show-decoded-url' has non-nil value, it is refered to decide
-a decoding scheme."
+  "Return a readable string for a given encoded URL."
   (when (stringp url)
-    (let ((rule
-	   (if (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))))))
-	     w3m-show-decoded-url)))
-      (if rule
-	  (w3m-url-decode-string url
-				 (if (eq t rule)
-				     w3m-coding-system-priority-list
-				   rule))
-	url))))
+    (setq url (w3m-puny-decode-url url))
+    (if (string-match "[^\000-\177]" url)
+	url
+      (w3m-url-decode-string url (w3m-url-coding-system url)))))
 
-(defsubst w3m-url-transfer-encode-string (url &optional coding)
+(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.
+Optional CODING is a coding system, that defaults to the one determined
+according to URL and `w3m-url-coding-system-alist', used to encode URL.
 
 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))
+  (unless coding
+    (setq coding (w3m-url-coding-system url)))
   (let ((start 0)
-	(buf))
+	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)))))
+			  (lambda (c) (format "%%%02X" c))
+			  (encode-coding-string (match-string 0 url) coding)))
 		  (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-db-setup ()
-  "Initialize the hash table of `w3m-entity-alist'."
-  (setq w3m-entity-db (make-vector w3m-entity-db-size 0))
-  (dolist (elem w3m-entity-alist)
-    (set (intern (car elem) w3m-entity-db)
-	 (cdr elem))))
-
-(eval-and-compile
-  (unless (fboundp 'w3m-ucs-to-char)
-    (defun w3m-ucs-to-char (codepoint)
-      "A dummy function defined since nothing provided the regular function.
-This function simply returns the arg if it is between 0x20 and 0x7e,
-otherwise returns the tilde character."
-      (if (or (< codepoint 32) (< 127 codepoint))
-	  ?~ ;; unsupported character
-	codepoint))))
-
-(defun w3m-entity-value (name strict)
+(defun w3m-entity-value (name)
   "Get a char corresponding to NAME from the html char entities database.
-The database is kept in `w3m-entity-db'.  If STRICT is non-nil, the
-exact match with NAME is made.  Otherwise, it allows trailing extra
-characters in NAME, but those characters appear in the return value.
-For example:
-
-\(w3m-entity-value \"ampersand\" t) => nil
-\(w3m-entity-value \"ampersand\" nil) => \"&ersand\""
-  (unless w3m-entity-db
-    ;; Initialize the hash table.
-    (w3m-entity-db-setup))
+The database is kept in `w3m-entity-table'."
   ;; Return a value of the specified entity, or nil if it is unknown.
-  (if (char-equal (string-to-char name) ?#)
-      (progn
-	(setq name (substring name 1))
-	(let ((codepoint (if (char-equal (string-to-char name) ?x)
-			     (string-to-number (substring name 1) 16)
-			   (string-to-number name))))
-	  (char-to-string (w3m-ucs-to-char codepoint))))
-    (let ((val (intern-soft name w3m-entity-db))
-	  (pre name)
-	  (post ""))
-      (if (not strict)
-	  (while (and (null val)
-		      (< 0 (length pre))
-		      (null (setq val (intern-soft pre w3m-entity-db))))
-	    (setq post (concat (substring pre -1) post)
-		  pre (substring pre 0 -1))))
-      (and val (concat (symbol-value val) post)))))
+  (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."
@@ -3020,8 +3432,17 @@
       (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-text-properties start (match-beginning 0)
-				 '(face w3m-bold-face))))))
+	(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."
@@ -3031,25 +3452,47 @@
       (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-text-properties start (match-beginning 0)
-				 '(face w3m-underline-face))))))
+	(w3m-add-face-property start (match-beginning 0) 'w3m-underline)))))
 
 (defun w3m-fontify-strike-through ()
   "Fontify strike-through text in the buffer containing halfdump."
-  (when (and w3m-fontify-strike-through
-	     (w3m-static-if (featurep 'xemacs)
-		 (device-on-window-system-p)
-	       window-system))
-    (goto-char (point-min))
-    (while (re-search-forward "\\[\\(DEL\\|S\\):" nil t)
+  (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 ":\\(DEL\\|S\\)]" nil t)
+	(when (re-search-forward "</s[ \t\r\f\n]*>" nil t)
 	  (delete-region (match-beginning 0) (match-end 0))
-	  (w3m-add-text-properties start (match-beginning 0)
-				   '(face w3m-strike-through-face)))))))
+	  (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)))))
 
-(defsubst w3m-decode-anchor-string (str)
+(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:
@@ -3060,8 +3503,9 @@
   ;; is replaced from "&" and embedded in the w3m's halfdump should be
   ;; restored into "&" some time.
   (let ((start 0) (buf))
-    (while (string-match "&amp;" str start)
-      (setq buf (cons "&" (cons (substring str start (match-beginning 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)))))
@@ -3080,9 +3524,9 @@
 
 (defun w3m-fontify-anchors ()
   "Fontify anchor tags in the buffer which contains halfdump."
-  (let ((help (w3m-make-help-echo w3m-href-anchor))
-	(balloon (w3m-make-balloon-help w3m-href-anchor))
-	prenames start end)
+  (let ((help (w3m-make-help-echo w3m-balloon-help))
+	(balloon (w3m-make-balloon-help w3m-balloon-help))
+	prenames start end bhhref)
     (goto-char (point-min))
     (setq w3m-max-anchor-sequence 0)	;; reset max-hseq
     (while (re-search-forward "<_id[ \t\r\f\n]+" nil t)
@@ -3092,15 +3536,18 @@
 	(delete-region start (point))
 	(w3m-add-text-properties start (point-max)
 				 (list 'w3m-name-anchor
-				       (cons id prenames)))))
+				       (cons (w3m-decode-entities-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
+      (w3m-parse-attributes (href name id charset title
 				  (rel :case-ignore) (hseq :integer))
 	(unless name
 	  (setq name id))
+	(when href
+	  (setq href (w3m-decode-anchor-string href)))
 	(when rel
 	  (setq rel (split-string rel))
 	  (cond
@@ -3115,34 +3562,41 @@
 	  (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)))
+	    (setq href (w3m-expand-url href))
 	    (unless (w3m-url-local-p href)
-	      (setq href (if (and (string-match w3m-url-components-regexp href)
-				  (match-beginning 8))
+	      (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))
+					(substring href 0 (match-beginning 8)))
 				       "#" tmp))
-			 (w3m-url-transfer-encode-string
-			  href
-			  (w3m-charset-to-coding-system charset)))))
+			 (w3m-url-transfer-encode-string href))))
 	    (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))
+	    (if title
+		(progn
+		  (setq title (w3m-decode-entities-string title))
+		  (setq bhhref (concat (w3m-decode-anchor-string title)
+				       "\n"
+				       (w3m-url-readable-string href))))
+	      (setq bhhref (w3m-url-readable-string href)))
 	    (w3m-add-text-properties start end
-				     (list 'face (if (w3m-arrived-p href)
-						     'w3m-arrived-anchor-face
-						   'w3m-anchor-face)
-					   'w3m-href-anchor href
+				     (list 'w3m-href-anchor href
+					   'w3m-balloon-help bhhref
+					   'w3m-anchor-title title
 					   'mouse-face 'highlight
 					   'w3m-anchor-sequence hseq
 					   'help-echo help
-					   'balloon-help balloon))
+					   '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-face
-					  'w3m-anchor-face))
+					    'w3m-arrived-anchor
+					  'w3m-anchor))
 		    (widget-mouse-face 'highlight)
 		    w)
 		(setq w (widget-convert-button 'default start end
@@ -3153,13 +3607,16 @@
 	    (when name
 	      (w3m-add-text-properties start (point-max)
 				       (list 'w3m-name-anchor2
-					     (cons name prenames))))))
+					     (cons (w3m-decode-entities-string name)
+						   prenames))))))
 	 (name
 	  (w3m-add-text-properties start (point-max)
 				   (list 'w3m-name-anchor2
-					 (cons name prenames)))))))
+					 (cons (w3m-decode-entities-string name)
+					       prenames)))))))
     (when w3m-icon-data
-      (setq w3m-icon-data (cons (w3m-expand-url (car 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
@@ -3175,28 +3632,30 @@
   (unless (featurep 'xemacs)
     (defun w3m-setup-menu ()
       "Define menubar buttons for Emacsen."
-      (let ((items (mapcar 'car (cdr (lookup-key global-map [menu-bar])))))
-	(when items
-	  ;; Place the W3M menu in the forefront of the menubar.
-	  (set (make-local-variable 'menu-bar-final-items)
-	       (delq 'w3m items))))
+      (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))))))
+	  (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-image))
-	(balloon (w3m-make-balloon-help w3m-image))
-	upper start end)
+  (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)
@@ -3205,48 +3664,186 @@
       (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))
-	  (unless (or (w3m-anchor start)
-		      (w3m-action start))
-	    ;; No need to use `w3m-add-text-properties' here.
-	    (add-text-properties start end (list 'face 'w3m-image-face
-						 'mouse-face 'highlight
-						 'help-echo help
-						 'balloon-help balloon))))))))
-
-(defsubst w3m-toggle-inline-images-internal (status no-cache url)
+					 '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."
-  (interactive "P")
   (let ((cur-point (point))
-	(buffer-read-only)
-	(end (point-min))
+	(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)))
+	  (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 (not url)
+	    (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)
@@ -3265,37 +3862,72 @@
 		     '(w3m-image-dummy t w3m-image "dummy"))
 		    (setq end (point)))
 		(goto-char cur-point)
-		(when (w3m-url-valid 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 (buffer-read-only)
-				    (w3m-insert-image start end image iurl))
-				  ;; Redisplay
-				  (when w3m-force-redisplay
-				    (sit-for 0)))
-			      (let (buffer-read-only)
-				(w3m-add-text-properties
-				 start end '(w3m-image-status off))))
-			    (set-buffer-modified-p nil))
-			  (set-marker start nil)
-			  (set-marker end nil)))))))))
+		(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)))
+	(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))
@@ -3316,82 +3948,148 @@
 	      ;; Remove dummy string.
 	      (delete-region start end)
 	      (setq end start))
-	     ((get-text-property start 'w3m-bitmap-image)
-	      (goto-char end)
-	      (setq end (w3m-remove-image start end)))
 	     (t (w3m-remove-image start end)))
-	    (w3m-add-text-properties start end '(w3m-image-status off))))
+	    (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.
+  "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 ((url (w3m-image))
-	(status (get-text-property (point) 'w3m-image-status))
-	(scale (get-text-property (point) 'w3m-image-scale)))
-    (if (and scale (equal status 'off))
-	(w3m-zoom-in-image 0)
-      (if (w3m-url-valid url)
-	  (progn
-	    (if force (setq status 'off))
-	    (w3m-toggle-inline-images-internal status no-cache url))
+  (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 (w3m-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.
-If FORCE is non-nil, displaying images is forced.  If NO-CACHE is
-non-nil, cached data will not be used."
+  "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")
-  (let ((status w3m-display-inline-images))
-    (unless (w3m-display-graphic-p)
-      (error "Can't display images in this environment"))
-    (if force (setq w3m-display-inline-images nil
-		    status nil))
-    (unwind-protect
-	(w3m-toggle-inline-images-internal (if w3m-display-inline-images
-					       'on 'off)
-					   no-cache nil)
-      (unless (setq w3m-display-inline-images (not status))
-	(w3m-process-stop (current-buffer)))
-      (force-mode-line-update))))
+  (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 (w3m-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"))))
 
-(defsubst w3m-resize-inline-image-internal (url rate)
+(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."
-  (interactive "P")
-  (let ((buffer-read-only)
-	start end iurl image size iscale scale)
-    (if (or (featurep 'xemacs)
-	    (>= emacs-major-version 21))
-	(progn
-	  (setq start (point)
-		end (or (next-single-property-change start 'w3m-image)
-			(point-max))
-		iurl (w3m-image start)))
-      ;; The case of using BITMAP-MULE:
-      ;; Look for the start and the end positions of the first line of
-      ;; a bitmap image.
-      (setq end (point-min)
-	    iurl "")
-      (while (and (not (string-equal url iurl))
-		  (setq start
-			(if (w3m-image end)
-			    end
-			  (next-single-property-change end 'w3m-image))))
-	(setq end (or (next-single-property-change start 'w3m-image)
-		      (point-max))
-	      iurl (w3m-image start)))
-      (goto-char start)
-      ;; Remove an existing bitmap image.
-      (let ((inhibit-read-only t))
-	(setq end (or (w3m-remove-image start end) end))))
-    (setq size (get-text-property start 'w3m-image-size)
-	  iscale (or (get-text-property start 'w3m-image-scale) '100))
+  (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))
@@ -3406,7 +4104,15 @@
 				   (progn (insert image) (point))
 				   '(w3m-image-dummy t
 						     w3m-image "dummy")))
-      (when iurl
+      (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))
@@ -3424,70 +4130,148 @@
 		(with-current-buffer (marker-buffer start)
 		  (if image
 		      (when (equal url w3m-current-url)
-			(let (buffer-read-only)
+			(let ((inhibit-read-only t))
 			  (w3m-static-when (featurep 'xemacs)
 			    (w3m-remove-image start end))
-			  (w3m-insert-image start end image iurl))
+			  (w3m-insert-image start end image iurl)
+			  (w3m-image-animate image))
 			;; Redisplay
 			(when w3m-force-redisplay
 			  (sit-for 0)))
-		    (let (buffer-read-only)
+		    (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-resize-image-interactive (image &optional rate changed-rate)
+  "Interactively resize IMAGE.
+If RATE is not given, use `w3m-resize-image-scale'.
+CHANGED-RATE is currently changed rate / 100."
+  (let ((char (w3m-static-if (featurep 'xemacs)
+		  (progn
+		    (message
+		     "Resize: [+ =] enlarge [-] shrink [0] original [q] quit")
+		    (read-char-exclusive))
+		(read-char-exclusive
+		 (propertize
+		  "Resize: [+ =] enlarge [-] shrink [0] original [q] quit"
+		  'face 'w3m-lnum-minibuffer-prompt))))
+	(changed-rate (or changed-rate 1)))
+    (w3m-static-if (featurep 'xemacs)
+	(setq char (char-octet char)))
+    (while (memq char '(?+ ?- ?= ?0))
+      (cond ((memq char '(?+ ?=))
+	     (let ((percent (+ 100 (or rate
+				       w3m-resize-image-scale))))
+	       (w3m-resize-inline-image-internal image percent)
+	       (setq changed-rate (* changed-rate
+				     (/ percent 100.0)))))
+	    ((eq char ?-)
+	     (let ((percent (- 100 (if rate
+				       (if (> rate 99) 99
+					 rate)
+				     w3m-resize-image-scale))))
+	       (w3m-resize-inline-image-internal image percent)
+	       (setq changed-rate (* changed-rate
+				     (/ percent 100.0)))))
+	    ((eq char ?0)
+	     (w3m-resize-inline-image-internal image
+					       (/ 100.0 changed-rate))
+	     (setq changed-rate 1)))
+      (setq char
+	    (w3m-static-if (featurep 'xemacs)
+		(progn
+		  (message
+		   "Resize: [+ =] enlarge [-] shrink [0] original [q] quit")
+		  (read-char-exclusive))
+	      (read-char-exclusive
+	       (propertize
+		"Resize: [+ =] enlarge [-] shrink [0] original [q] quit"
+		'face 'w3m-lnum-minibuffer-prompt))))
+      (w3m-static-if (featurep 'xemacs)
+	  (setq char (char-octet char))))))
+
 (defun w3m-zoom-in-image (&optional rate)
-  "Zoom in an image on the point."
+  "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)))
-    (unless rate
-      (setq rate w3m-resize-image-scale))
     (if url
-	(w3m-resize-inline-image-internal url (+ 100 rate))
+	(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."
+  "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)))
-    (unless rate
-      (setq rate w3m-resize-image-scale))
     (if url
-	(w3m-resize-inline-image-internal url (- 100 rate))
+	(w3m-resize-inline-image-internal
+	 url
+	 (- 100 (or rate w3m-resize-image-scale)))
       (w3m-message "No image at point"))))
 
-(defun w3m-decode-entities (&optional reserve-prop)
+(defun w3m-decode-entities (&optional keep-properties)
   "Decode entities in the current buffer.
-If optional RESERVE-PROP is non-nil, text property is reserved."
+If optional KEEP-PROPERTIES is non-nil, text property is reserved."
   (save-excursion
     (goto-char (point-min))
-    (let (start prop value)
+    ;; 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))
-	(if reserve-prop
-	    (setq prop (text-properties-at (match-beginning 0))))
-	;; 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)
-					    (match-beginning 2)))
-	  (replace-match value nil t))
-	(if (and reserve-prop prop)
-	    (w3m-add-text-properties start (point) prop))))))
+	(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
-    (with-temp-buffer
-      (insert str)
-      (w3m-decode-entities)
-      (buffer-string))))
+    ;; 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."
@@ -3496,7 +4280,7 @@
     (while (string-match "[<>&]" str pos)
       (setq buf
 	    (cons ";"
-		  (cons (car (rassoc (match-string 0 str) w3m-entity-alist))
+		  (cons (gethash (match-string 0 str) w3m-entity-reverse-table)
 			(cons "&"
 			      (cons (substring str pos (match-beginning 0))
 				    buf))))
@@ -3508,24 +4292,30 @@
 (defun w3m-fontify ()
   "Fontify the current buffer."
   (let ((case-fold-search t)
-	(buffer-read-only))
-    (run-hooks 'w3m-fontify-before-hook)
+	(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))))
+	  (delete-region start (match-end 0))
+	  (goto-char (point-min))))
     ;; Delete extra title tag.
-    (goto-char (point-min))
     (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))
@@ -3536,43 +4326,64 @@
     ;; Remove other markups.
     (goto-char (point-min))
     (while (re-search-forward "</?[A-Za-z_][^>]*>" nil t)
-      (let ((fid (get-text-property (match-beginning 0) 'w3m-form-field-id)))
-	(if (and fid (string-match "/type=textarea/" fid))
-	    (goto-char (match-end 0))
-	  (delete-region (match-beginning 0) (match-end 0)))))
+      (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)
+      (while (re-search-forward "^[ \t]*\n\\(?:[ \t]*\n\\)+" nil t)
 	(delete-region (match-beginning 0) (1- (match-end 0)))))
-    (w3m-message "Fontifying...done")
+
+    ;; 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 　")
+    (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-face' to
-`w3m-arrived-anchor-face'."
-  (save-excursion
-    (and buff (set-buffer buff))
-    (when (and (eq major-mode 'w3m-mode)
-	       (eq (get-text-property (point) 'face) 'w3m-anchor-face))
-      (let* ((start)
-	     (end (next-single-property-change (point) 'face))
-	     (buffer-read-only))
-	(when (and end
-		   (setq start (previous-single-property-change end 'face)))
-	  (w3m-add-text-properties start end '(face w3m-arrived-anchor-face)))
-	(set-buffer-modified-p nil)))))
+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 (string-match "\\`\\(?:file:\\|[/~]\\|\\.\\.?/\\|[a-zA-Z]:\\)" url)
       (if (eq flag 'lambda)
 	  (file-exists-p (w3m-url-to-file-name url))
 	(let* ((partial
@@ -3611,16 +4422,25 @@
 
 (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.  That it returns an
-invalid url if Gmane doesn't handle the group cannot be helped."
+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)
-	  md case-fold-search)
+	  case-fold-search)
       (goto-char (point-min))
-      (re-search-forward (concat "^\\("
+      (re-search-forward (concat "^\\(?:"
 				 (regexp-quote mail-header-separator)
 				 "\\)?$")
 			 nil 'move)
@@ -3632,156 +4452,232 @@
 	  (beginning-of-line)
 	  (while (and (memq (char-after) '(?\t ? ))
 		      (zerop (forward-line -1))))
-	  (when (or (looking-at "References:[\t\n ]*<\\([^\t\n <>]+\\)>")
-		    (prog1
-			(looking-at "Message-ID:[\t\n ]*<\\([^\t\n <>]+\\)>")
-		      (setq md (match-data))
-		      (goto-char (point-min))
-		      (unless (re-search-forward
-			       "^References:[\t\n ]*<\\([^\t\n <>]+\\)>"
-			       nil t)
-			(set-match-data md))))
+	  (when (looking-at
+		 "\\(?:Message-ID\\|References\\):[\t\n ]*<\\([^\t\n <>]+\\)>")
 	    (format
 	     fmt
-	     (w3m-url-encode-string (match-string-no-properties 1)))))))))
+	     (w3m-url-encode-string (match-string-no-properties 1)
+				    nil t))))))))
+
+(defun w3m-shr-url-at-point ()
+  "Return a url that shr.el provides at point."
+  (w3m-get-text-property-around 'shr-url))
+
+(defun w3m-header-line-url ()
+  "Return w3m-current-url if point stays at 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
-  (cond
-   ((locate-library "ffap")
-    (autoload 'ffap-url-at-point "ffap")
-    (if (featurep 'xemacs)
-	(if (featurep 'mule)
-	    (defun w3m-url-at-point ()
-	      "\
+  (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)
-		  (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)))))
-	  (defun w3m-url-at-point ()
-	    "\
+	     (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)
-		(unless (fboundp 'ffap-url-at-point)
-		  ;; It is necessary to bind `ffap-xemacs'.
-		  (load "ffap" nil t))
-		(let (ffap-xemacs)
-		  (ffap-url-at-point)))))
-      (defun w3m-url-at-point ()
-	(or (w3m-gmane-url-at-point)
-	    (ffap-url-at-point))))
-    (eval-after-load "ffap"
-      '(progn
-	 ;; Under Emacs 19, 20 or XEmacs, `ffap-url-regexp' won't match
-	 ;; to https urls by default.
-	 (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))))))
-   ((locate-library "thingatpt")
-    (autoload 'thing-at-point "thingatpt")
-    (defun w3m-url-at-point ()
-      "Return url from around point if it exists, or nil."
-      (or (w3m-gmane-url-at-point)
-	  (let ((url (thing-at-point 'url)))
-	    (when url
-	      (set-text-properties 0 (length url) nil url)
-	      url)))))
-   (t
-    (defalias 'w3m-url-at-point 'w3m-gmane-url-at-point))))
+	     (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-shr-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 ()
+(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."
+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
-	  (w3m-replace-in-string (buffer-substring-no-properties
-				  (region-beginning) (region-end))
-				 "[\t\r\f\n 　]+" "")
+	  (let ((string (buffer-substring-no-properties
+			 (region-beginning) (region-end))))
+	    (with-temp-buffer
+	      (insert string)
+	      (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))
+	      (while (re-search-forward "\
+\\(?:[\t\f\r 　]+\n[\t\f\r 　]*\\|[\t\f\r 　]*\n[\t\f\r 　]+\\)+" nil t)
+		(delete-region (match-beginning 0) (match-end 0)))
+	      (buffer-string)))
 	(w3m-deactivate-region))
-    (w3m-url-at-point)))
-
-(defsubst w3m-canonicalize-url (url)
-  "Add a scheme part to an URL if it has no scheme part."
-  (if (and (string-match w3m-url-components-regexp url)
-	   (match-beginning 1))
-      url
-    (concat (if (and (file-name-absolute-p url)
-		     (file-exists-p url))
-		"file://"
-	      "http://")
-	    url)))
+    (or (w3m-anchor)
+	(unless w3m-display-inline-images
+	  (w3m-image))
+	(w3m-url-at-point)
+	(and default=current
+	     (stringp w3m-current-url)
+	     (if (string-match "\\`about://\\(?:header\\|source\\)/"
+			       w3m-current-url)
+		 (substring w3m-current-url (match-end 0))
+	       (let ((name
+		      (or (car (get-text-property (point) 'w3m-name-anchor))
+			  (car (get-text-property (point) 'w3m-name-anchor2)))))
+		 (if name
+		     (concat w3m-current-url "#" name)
+		   w3m-current-url)))))))
+
+(defun w3m-canonicalize-url (url &optional feeling-lucky)
+  "Fix URL that does not look like a valid url.
+For URL having no scheme part, return a url that leaves it to chance if
+FEELING-LUCKY is non-nil (what is called \"I'm Feeling Lucky\" on Google).
+Also fix URL that fails to have put a separator following a domain name."
+  (if (string-match "\\`\\(https?://[-.0-9a-z]+\\)\\([#?].*\\)" url)
+      (concat (match-string 1 url) "/" (match-string 2 url))
+    (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
+      (concat "\
+http://www.google.com/search?btnI=I%%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="
+	      (w3m-url-encode-string url nil t)))
+     (t
+      (concat "http://" url)))))
 
-(defun w3m-input-url (&optional prompt initial default quick-start)
+(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)
-    (unless default
-      (setq default w3m-home-page))
-    (unless initial
-      (setq initial (w3m-active-region-or-url-at-point)))
+    (cond ((null initial)
+	   (when (setq initial (w3m-active-region-or-url-at-point t))
+	     (if (string-match "\\`about:" initial)
+		 (setq initial nil)
+	       (unless (string-match "[^\000-\177]" initial)
+		 (setq
+		  initial
+		  (w3m-url-decode-string initial
+					 (or (w3m-url-coding-system initial)
+					     w3m-current-coding-system)
+					 "%\\([2-9a-f][0-9a-f]\\)"))))))
+	  ((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 '(beginning-of-line))))
-		  (completing-read
-		   (or prompt
-		       (if default
-			   (format "URL (default %s): "
-				   (if (stringp default)
-				       (if (eq default w3m-home-page)
-					   "HOME" default)
-				     (prin1-to-string default)))
-			 "URL: "))
-		   'w3m-url-completion nil nil initial
-		   'w3m-input-url-history)))
-      (when (string= "" url)
-	(setq url default))
-      (if (stringp url)
-	  (progn
-	    ;; remove duplication
-	    (setq w3m-input-url-history
-		  (cons url (delete url w3m-input-url-history)))
-	    (w3m-canonicalize-url url))
-	;; It may be `popup'.
-	url))))
-
+		       (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 "
+					 (cond ((equal default "about:blank")
+						"BLANK")
+					       ((equal default w3m-home-page)
+						"HOME")
+					       (t default))
+					 "): "))
+			     prompt)
+			 (if default
+			     (format "URL %s(default %s): "
+				     (if feeling-lucky "or Keyword " "")
+				     (if (stringp default)
+					 (cond ((string= default "about:blank")
+						"BLANK")
+					       ((string= default w3m-home-page)
+						"HOME")
+					       (t 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))))
+      (unless (string-equal url "")
+	(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))
-    (save-excursion
-      (set-buffer (w3m-get-buffer-create " *w3m cache*"))
+    (with-current-buffer (w3m-get-buffer-create " *w3m cache*")
       (buffer-disable-undo)
       (set-buffer-multibyte nil)
       (setq buffer-read-only t
@@ -3795,11 +4691,14 @@
   (setq w3m-cache-hashtb nil
 	w3m-cache-articles nil))
 
-(defsubst w3m-cache-header-delete-variable-part (header)
-  (let (buf)
+(defun w3m-cache-header-delete-variable-part (header)
+  (let (buf flag)
     (dolist (line (split-string header "\n+"))
-      (unless (string-match "\\`\\(Date\\|Server\\|W3m-[^:]+\\):" line)
-	(push line buf)))
+      (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)
@@ -3807,6 +4706,7 @@
 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)
+  (setq url (w3m-w3m-canonicalize-url url))
   (let ((ident (intern url w3m-cache-hashtb)))
     (if (boundp ident)
 	(if (and
@@ -3822,17 +4722,16 @@
 (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)))
+  (let ((ident (intern (w3m-w3m-canonicalize-url url) w3m-cache-hashtb)))
     (and (boundp ident)
 	 (symbol-value ident))))
 
 (defun w3m-cache-remove-oldest ()
-  (save-excursion
-    (set-buffer w3m-cache-buffer)
+  (with-current-buffer w3m-cache-buffer
     (goto-char (point-min))
     (unless (zerop (buffer-size))
       (let ((ident (get-text-property (point) 'w3m-cache))
-	    buffer-read-only)
+	    (inhibit-read-only t))
 	;; Remove the ident from the list of articles.
 	(when ident
 	  (setq w3m-cache-articles (delq ident w3m-cache-articles)))
@@ -3848,9 +4747,8 @@
 	beg end)
     (when (memq ident w3m-cache-articles)
       ;; It was in the cache.
-      (save-excursion
-	(set-buffer w3m-cache-buffer)
-	(let (buffer-read-only)
+      (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).
@@ -3864,6 +4762,7 @@
 The contents are assumed to be in BUFFER.  Return a symbol which
 identifies the data in the cache."
   (w3m-cache-setup)
+  (setq url (w3m-w3m-canonicalize-url url))
   (let ((ident (intern url w3m-cache-hashtb)))
     (w3m-cache-remove url)
     ;; Remove the oldest article, if necessary.
@@ -3871,9 +4770,8 @@
 	 (>= (length w3m-cache-articles) w3m-keep-cache-size)
 	 (w3m-cache-remove-oldest))
     ;; Insert the new article.
-    (save-excursion
-      (set-buffer w3m-cache-buffer)
-      (let (buffer-read-only)
+    (with-current-buffer w3m-cache-buffer
+      (let ((inhibit-read-only t))
 	(goto-char (point-max))
 	(let ((b (point)))
 	  (insert-buffer-substring buffer)
@@ -3888,12 +4786,11 @@
 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)))
+  (let ((ident (intern (w3m-w3m-canonicalize-url url) w3m-cache-hashtb)))
     (when (memq ident w3m-cache-articles)
       ;; It was in the cache.
       (let (beg end)
-	(save-excursion
-	  (set-buffer w3m-cache-buffer)
+	(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).
@@ -3903,10 +4800,8 @@
 	    (setq w3m-cache-articles (delq ident w3m-cache-articles))))
 	(and beg
 	     end
-	     (save-excursion
-	       (when buffer
-		 (set-buffer buffer))
-	       (let (buffer-read-only)
+	     (with-current-buffer (or buffer (current-buffer))
+	       (let ((inhibit-read-only t))
 		 (insert-buffer-substring w3m-cache-buffer beg end))
 	       t))))))
 
@@ -3915,24 +4810,51 @@
   "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))))
-		   (and (string-match "^\\(Last-Modified\\|ETag\\):[ \t]" head)
-			(not (or (string-match "^Pragma:[ \t]+no-cache\n" head)
-				 (string-match
-				  "^Cache-control:[ \t]+\\(no-cache\\|max-age=0\\)\n"
-				  head)))))))
-	   ident))))
+    (let ((ident (intern (w3m-w3m-canonicalize-url 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 default
+    (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)))
@@ -3956,6 +4878,20 @@
   (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)
@@ -3986,8 +4922,6 @@
 	      (coding-system-for-read 'binary)
 	      (default-process-coding-system (cons 'binary 'binary)))
 	  (w3m-process-with-environment w3m-command-environment
-	    (w3m-static-if (featurep 'xemacs)
-		(goto-char (point-max)))
 	    (zerop (apply 'call-process-region
 			  (point-min) (point-max)
 			  (w3m-which-command (car x))
@@ -4007,51 +4941,88 @@
 			       (content :case-ignore))
 	  (when (and (string= http-equiv "content-type")
 		     content
-		     (string-match ";[ \t\n]*charset=\\([^\"]+\\)" 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))
-    (or (when (looking-at "[ \t\r\f\n]*<\\?xml[ \t\r\f\n]+")
-	  (goto-char (match-end 0))
-	  (w3m-parse-attributes ((encoding :case-ignore))
-	    encoding))
-	"utf-8")))
+    (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 (cs)
-    (unless content-type
-      (setq content-type (w3m-content-type url)))
-    (unless content-charset
-      (setq content-charset
-	    (or (w3m-content-charset url)
-		(when (string= "text/html" content-type)
-		  (w3m-detect-meta-charset))
-		(when (string-match
-		       "\\`\\(application\\|text\\)/\\([a-z]+\\+\\)?xml\\'"
-		       content-type)
-		  (w3m-detect-xml-charset)))))
-    (cond
-     ((and (eq w3m-type 'w3mmee)
-	   (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)
-    (setq w3m-current-coding-system
-	  (or cs
-	      (w3m-detect-coding-region
-	       (point-min) (point-max)
-	       (if (w3m-url-local-p url)
-		   nil
-		 w3m-coding-system-priority-list))))
-    (set-buffer-multibyte t)
-    (decode-coding-region (point-min) (point-max) w3m-current-coding-system)))
+  (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"))
@@ -4066,8 +5037,6 @@
 	    (append args (list "-o" "-cs" (symbol-name w3m-coding-system))))
       (setq charset w3m-coding-system))
     (w3m-process-with-environment w3m-command-environment
-      (w3m-static-if (featurep 'xemacs)
-	  (goto-char (point-max)))
       (apply 'call-process-region (point-min) (point-max)
 	     w3m-mbconv-command t t nil args))
     charset))
@@ -4083,8 +5052,9 @@
   "Return the content type and the content encoding of URL."
   (setq url (or (w3m-url-to-file-name url)
 		(file-name-nondirectory url)))
-  (if (and (file-name-absolute-p url)
-	   (file-directory-p 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
@@ -4125,7 +5095,7 @@
 	  (nth 5 attr)
 	  (w3m-expand-file-name-as-url (file-truename file)))))
 
-(defun w3m-local-retrieve (url &optional no-decode &rest args)
+(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."
@@ -4133,11 +5103,9 @@
     (when (file-readable-p file)
       (if (file-directory-p file)
 	  (w3m-local-dirlist-cgi url)
-	(let ((coding-system-for-read 'binary)
-	      (file-coding-system-for-read 'binary))
-	  (if no-decode
+	(let ((coding-system-for-read 'binary))
+	  (if no-uncompress
 	      (let (jka-compr-compression-info-list
-		    jam-zcat-filename-list
 		    format-alist)
 		(insert-file-contents file))
 	    (insert-file-contents file))))
@@ -4155,20 +5123,25 @@
 			  (format "%s.%d." (user-login-name) (emacs-pid))))
 		(cfile (make-temp-name
 			(expand-file-name "w3melck" w3m-profile-directory)))
-		file beg end)
+		(env (copy-sequence w3m-command-environment))
+		file)
 	    (with-temp-buffer
 	      (insert lcookie)
 	      (write-region (point-min) (point-max) cfile 'nomsg))
 	    (w3m-process-with-environment
-		(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)))
+		(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))
@@ -4176,17 +5149,14 @@
 	    (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)
+	      (while (re-search-forward "<a href=\"\\([^\"]+\\)\"\\(?:>\\| \\)"
+					nil t)
 		(setq file (match-string 1))
-		(setq beg (match-beginning 1))
-		(setq end (match-end 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)))
-		(delete-region beg end)
-		(goto-char beg)
 		(insert (encode-coding-string
 			 (w3m-url-decode-string file
 						w3m-file-name-coding-system)
@@ -4263,41 +5233,56 @@
 				   "last-modified"
 				   "location"
 				   "w3m-current-url"
+				   "w3m-document-charset"
 				   "w3m-ssl-certificate"
-				   "x-w3m-content-encoding"))
+				   "x-w3m-content-encoding"
+				   "alternates"))
 				"\\):[ \t]*"))
 		      line)
 	(push (cons (downcase (match-string 1 line))
 		    (substring line (match-end 0)))
 	      headers))))
-    (let (type charset)
-      (when (setq type (cdr (assoc "content-type" 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 (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
-	    (or type (w3m-local-content-type url))
-	    (or charset
-		(and (eq w3m-type 'w3mmee)
-		     (setq charset
-			   (cdr (assoc "w3m-document-charset" headers)))
-		     (car (split-string charset))))
+	    (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)
-		     (when (eq w3m-type 'w3mmee)
-		       (assoc "x-w3m-content-encoding" headers))))
+		     (assoc "x-w3m-content-encoding" headers)))
 	    (let ((v (cdr (assoc "last-modified" headers))))
 	      (and v (w3m-time-parse-string v)))
-	    (or (when (string-match "\\`ftps?:" url)
-		  (cdr (assoc "w3m-current-url" headers)))
+	    (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
@@ -4308,7 +5293,8 @@
 
 (defun w3m-w3m-dump-head (url handler)
   "Return the header string of URL."
-  (lexical-let ((url url))
+  (lexical-let ((url url)
+		(silent w3m-message-silent))
     (w3m-message "Request sent, waiting for response...")
     (w3m-process-do-with-temp-buffer
 	(success (progn
@@ -4319,17 +5305,18 @@
 				      (append w3m-command-arguments
 					      (list "-o" "follow_redirection=0"
 						    "-dump_head" url)))))
-      (w3m-message "Request sent, waiting for response...done")
-      (when success
-	(buffer-string)))))
+      (let ((w3m-message-silent silent))
+	(w3m-message "Request sent, waiting for response...done")
+	(when success
+	  (buffer-string))))))
 
-(defsubst w3m-w3m-canonicalize-url (url)
+(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)
+  (if (string-match "\\`\\(?:ht\\|f\\)tps?://[^/]+\\'" url)
       (concat url "/")
     url))
 
@@ -4362,24 +5349,15 @@
 		    (w3m-w3m-dump-head url handler)))
       (when header
 	(let ((attr (w3m-w3m-parse-header url header)))
-	  (if (string-match "\\`ftps?:" url)
-	      (progn
-		(setq url (nth 6 attr))
-		(if (string-match "/\\'" url)
-		    (list "text/html"
-			  (if w3m-accept-japanese-characters
-			      "w3m-euc-japan" "w3m-iso-latin-1")
-			  nil nil nil url)
-		  (list (w3m-local-content-type url) nil nil nil nil url)))
-	    (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'.
-		    nil
-		  ;; Follow redirection.
-		  (w3m-w3m-attributes-1 (nth 6 attr) no-cache
-					(1- counter) handler))
-	      (cdr attr))))))))
+	  (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
@@ -4399,7 +5377,8 @@
 
 (defun w3m-w3m-dump-extra (url handler)
   "Retrive headers and contents pointed to by URL"
-  (lexical-let ((url 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"
@@ -4416,36 +5395,22 @@
 				    (w3m-w3m-expand-arguments
 				     w3m-dump-head-source-command-arguments)
 				    (list url))))
-      (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)))
-	    ;; Asahi-shimbun sometimes says gif as jpeg mistakenly, for
-	    ;; example.  So, we cannot help trusting the data itself.
-	    (when (prog2
-		      (setq case-fold-search nil)
-		      (looking-at "\\(GIF8\\)\\|\\(\377\330\\)\\|\211PNG\r\n")
-		    (setq case-fold-search t))
-	      (let ((type (cond ((match-beginning 1) "gif")
-				((match-beginning 2) "jpeg")
-				(t "png"))))
-		(save-excursion
-		  (when (re-search-backward "^content-type: image/\\(.+\\)$"
-					    nil t)
-		    (delete-region (goto-char (match-beginning 1))
-				   (match-end 1))
-		    (insert type)))))
-	    (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))))))))
+      (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.
@@ -4466,7 +5431,7 @@
 	       (catch 'domain-match
 		 (setq host (match-string 1 url))
 		 (dolist (domain w3m-no-proxy-domains)
-		   (when (string-match (concat "\\(^\\|\\.\\)"
+		   (when (string-match (concat "\\(?:^\\|\\.\\)"
 					       (regexp-quote domain)
 					       "$")
 				       host)
@@ -4481,11 +5446,11 @@
     (cond
      ((eq w3m-add-referer 'lambda)
       (let (host)
-	(when (and (string-match w3m-url-components-regexp url)
-		   (match-beginning 4))
+	(w3m-string-match-url-components url)
+	(when (match-beginning 4)
 	  (setq host (match-string 4 url))
-	  (when (and (string-match w3m-url-components-regexp referer)
-		     (match-beginning 4))
+	  (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)
@@ -4576,28 +5541,38 @@
       (setq args (nconc args (list "-header" (concat "Referer: " referer)))))
     args))
 
-(defun w3m-w3m-retrieve (url no-decode no-cache post-data referer handler)
+(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-decode no-decode)
-		(current-buffer (current-buffer)))
+		(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)))
-      (when (memq (car attr) '(200 300))
-	(if (or no-decode
-		(w3m-decode-encoded-contents (nth 4 attr)))
-	    (let ((temp-buffer (current-buffer)))
-	      (with-current-buffer current-buffer
-		(insert-buffer-substring temp-buffer))
-	      (cadr attr))
-	  (ding)
-	  (w3m-message "Can't decode encoded contents: %s" url)
-	  nil)))))
+      (setq w3m-http-status (car-safe attr))
+      (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'."
@@ -4607,11 +5582,12 @@
 		   (list "-no-cookie"))
 		 (list "-o" "follow_redirection=0")
 		 (w3m-additional-command-arguments url)))
-	(temp-file))
-    (and no-cache
-	 w3m-broken-proxy-cache
-	 (setq w3m-command-arguments
-	       (append w3m-command-arguments '("-o" "no_cache=1"))))
+	(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
@@ -4637,7 +5613,7 @@
 		  (temp-file temp-file))
       (w3m-process-do
 	  (attr (or (unless no-cache
-		      (and (w3m-cache-available-p url)
+		      (and cachep
 			   (w3m-cache-request-contents url)
 			   (w3m-w3m-parse-header
 			    url (w3m-cache-request-header url))))
@@ -4648,7 +5624,7 @@
 	(if (memq (car attr) '(301 302 303 304 305 306 307))
 	    (if (zerop counter)
 		;; Redirect counter exceeds `w3m-follow-redirection'.
-		nil
+		'redirection-exceeded
 	      ;; Follow redirection.
 	      (erase-buffer)
 	      (unless (and post-data
@@ -4666,36 +5642,40 @@
 		(w3m-w3m-retrieve-1 (nth 6 attr)
 				    post-data referer no-cache
 				    (1- counter) handler)))
-	  attr)))))
+	  (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-decode no-cache
+(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)
-    (when (or (fboundp 'base64-decode-string)
-	      (condition-case nil
-		  ;; Emacs 19 doesn't provide the internal base64 functions.
-		  (require 'base64)
-		(error
-		 (message "You need to install the base64.el(c) module")
-		 nil)))
-      (let* ((b64d 'base64-decode-string)
-	     ;; Avoid compile warning under old Emacsen.
-	     (icon (funcall b64d w3m-emacs-w3m-icon)))
-	(if (featurep 'xemacs)
-	    (insert icon)
-	  (set-buffer-multibyte (multibyte-string-p icon))
+    (let ((icon (base64-decode-string w3m-emacs-w3m-icon)))
+      (if (featurep 'xemacs)
 	  (insert icon)
-	  (set-buffer-multibyte nil)))
-      "image/gif"))
+	(set-buffer-multibyte (multibyte-string-p icon))
+	(insert icon)
+	(set-buffer-multibyte nil)))
+    "image/gif")
    ((string-match "\\`about://source/" url)
-    (w3m-process-do
-	(type (w3m-retrieve (substring url (match-end 0))
-			    no-decode no-cache post-data referer handler))
-      (when type "text/plain")))
+    (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
@@ -4709,9 +5689,9 @@
 				 (intern-soft (concat "w3m-about-"
 						      (match-string 1 url))))
 			   (fboundp func))
-		      (funcall func url no-decode no-cache
+		      (funcall func url no-uncompress no-cache
 			       post-data referer handler)
-		    (w3m-about url no-decode no-cache))))
+		    (w3m-about url no-uncompress no-cache))))
 	(when type
 	  (when (string-match "\\`text/" type)
 	    (encode-coding-region (point-min) (point-max) w3m-coding-system))
@@ -4722,7 +5702,7 @@
 		(insert-buffer-substring temp-buffer))))
 	  type))))))
 
-(defun w3m-cid-retrieve (url &optional no-decode no-cache)
+(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
@@ -4737,15 +5717,54 @@
 \(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-DECODE
-specifies whether functions should not decode extracted contents;
+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-decode no-cache))))
+    (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
+		   (w3m-url-decode-string data-string 'us-ascii)))
+		 (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-decode no-cache
+(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.
@@ -4763,14 +5782,15 @@
 content type of the retrieved data will be passed to HANDLER as a
 string argument.
 
-NO-DECODE specifies whether this function should not decode contents.
+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."
+  (set (make-local-variable 'w3m-http-status) nil)
   (if (not handler)
       (condition-case nil
 	  (w3m-process-with-wait-handler
 	    (w3m-retrieve url
-			  no-decode no-cache post-data referer handler))
+			  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)))
@@ -4779,14 +5799,16 @@
       (cond
        ((string-match "\\`about:" url)
 	(w3m-about-retrieve url
-			    no-decode no-cache post-data referer handler))
+			    no-uncompress no-cache post-data referer handler))
        ((string-match "\\`cid:" url)
-	(w3m-cid-retrieve url no-decode no-cache))
+	(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-decode))
+	(w3m-local-retrieve url no-uncompress))
        (t
 	(w3m-w3m-retrieve url
-			  no-decode no-cache post-data referer handler))))))
+			  no-uncompress no-cache post-data referer handler))))))
 
 (defvar w3m-touch-file-available-p 'undecided)
 
@@ -4842,55 +5864,55 @@
 				  file)))))))
 
 ;;;###autoload
-(defun w3m-download (url &optional filename no-cache handler)
-  (interactive
-   (let* ((url (w3m-input-url "Download URL (default HOME): "
-			      (when (stringp w3m-current-url)
-				(if (string-match
-				     "\\`about://\\(header\\|source\\)/"
-				     w3m-current-url)
-				    (substring w3m-current-url (match-end 0))
-				  w3m-current-url))
-			      w3m-home-page))
-	  (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))))
+(defun w3m-download (&optional url 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 (list nil nil current-prefix-arg))
+  (unless url
+    (setq url (w3m-input-url "Download URL: ")))
+  (unless filename
+    (let ((basename (file-name-nondirectory (w3m-url-strip-query url))))
+      (when (string-match "^[\t ]*$" basename)
+	(when (string-match "^[\t ]*$"
+			    (setq basename (file-name-nondirectory url)))
+	  (setq basename "index.html")))
+      (setq filename
+	    (w3m-read-file-name (format "Download %s to: " url)
+				w3m-default-save-directory basename))))
   (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))))
+		  (filename filename)
+		  (page-buffer (current-buffer)))
       (w3m-process-do-with-temp-buffer
 	  (type (progn
 		  (w3m-clear-local-variables)
 		  (setq w3m-current-url url)
-		  (w3m-retrieve url t no-cache nil nil handler)))
+		  (w3m-retrieve url t no-cache post-data nil handler)))
 	(if type
 	    (let ((buffer-file-coding-system 'binary)
-		  (file-coding-system 'binary)
 		  (coding-system-for-write 'binary)
 		  jka-compr-compression-info-list
-		  jam-zcat-filename-list
 		  format-alist)
 	      (when (or (not (file-exists-p filename))
-			(y-or-n-p
-			 (format "File(%s) already exists. Overwrite? "
-				 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)
-		     ""))
+	  (with-current-buffer page-buffer
+	    (message "Cannot retrieve URL: %s%s" url
+		     (cond ((and w3m-process-exit-status
+				 (not (equal w3m-process-exit-status 0)))
+			    (format " (exit status: %s)"
+				    w3m-process-exit-status))
+			   (w3m-http-status
+			    (format " (http status: %s)" w3m-http-status))
+			   (t ""))))
 	  nil)))))
 
 ;;; Retrieve data:
@@ -4917,12 +5939,30 @@
       (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)
+    (when (re-search-forward "</head\\(?:[ \t\r\f\n][^>]*\\)?>" nil t)
       (save-restriction
 	(narrow-to-region (point-min) (point))
 	(goto-char (point-min))
@@ -4969,6 +6009,9 @@
 		(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)
@@ -4988,6 +6031,28 @@
 	      (delete-region start (point))
 	      (throw 'found nil))))))))
 
+(defun w3m-fix-illegal-blocks ()
+  "Replace <div>...</div> within <a>...</a> with <span>...<br></span>.
+<div> is a block element that should not appear within inline elements
+like <a>, however some web sites, e.g., news.google.com.tw, do so and
+w3m regards it as an incomplete <a> tag that is not closed."
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (while (re-search-forward "<a[\t\n ]" nil t)
+      (save-restriction
+	(narrow-to-region (match-beginning 0)
+			  (or (w3m-end-of-tag "a") (point-max)))
+	(goto-char (point-min))
+	(while (re-search-forward "<div[\t\n >]" nil t)
+	  (when (w3m-end-of-tag "div")
+	    (replace-match (concat "<span" (substring (buffer-substring
+						       (match-beginning 0)
+						       (match-end 1)) 4)
+				   "<br></span>")
+			   t t)
+	    (goto-char (match-beginning 0))))
+	(goto-char (point-max))))))
+
 (defun w3m-rendering-extract-title ()
   "Extract the title from the halfdump and put it into the current buffer."
   (goto-char (point-min))
@@ -5003,9 +6068,34 @@
 	(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
@@ -5013,13 +6103,6 @@
 	 (default-process-coding-system
 	   (cons coding-system-for-read coding-system-for-write)))
     (w3m-process-with-environment w3m-command-environment
-      ;; `call-process-region' provided by XEmacs of versions 21.5.7
-      ;; through 21.5.17 is evil.  It requires the point to have to be
-      ;; in the beginning or the end of the region when the 4th arg is t.
-      ;; The problem has been reported with an example as:
-      ;; <URL:http://list-archive.xemacs.org/xemacs-beta/200311/msg00253.html>
-      (w3m-static-if (featurep 'xemacs)
-	  (goto-char (point-max)))
       (apply 'call-process-region
 	     (point-min)
 	     (point-max)
@@ -5055,14 +6138,26 @@
   "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-fix-illegal-blocks)
   (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.
@@ -5071,89 +6166,152 @@
 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
-	       (not (string-match "\\`\\(ht\\|f\\)tps://" url))
-	       (not (y-or-n-p "You are leaving secure page.  Continue? ")))
+	       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)))
+		  (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)))
-	(when (buffer-live-p page-buffer)
-	  (setq url (w3m-url-strip-authinfo url))
-	  (if type
-	      (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)
-		  (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)
-			     "")))))))))
+	(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 1e-9)
+		      (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))
+		(with-current-buffer page-buffer
+		  (w3m-message
+		   "Cannot retrieve URL: %s%s" url
+		   (cond ((and w3m-process-exit-status
+			       (not (equal w3m-process-exit-status 0)))
+			  (format " (exit status: %s)"
+				  w3m-process-exit-status))
+			 (w3m-http-status
+			  (format " (http status: %s)" w3m-http-status))
+			 (t ""))))))))))))
 
 (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)
-	      (insert
-	       errmsg
-	       (format "<br><br><b>%s</b> could not be found."
-		       (w3m-get-server-hostname url))
-	       " Please check the name, and try again."))
+  (let ((case-fold-search t)
+	(header (w3m-cache-request-header url))
+	exit-status http-status errmsg)
+    (with-current-buffer page-buffer
+      (setq exit-status w3m-process-exit-status
+	    http-status w3m-http-status))
+    (setq errmsg
+	  (concat
+	   "<br><h1>Cannot retrieve URL: <a href=\""
+	   url "\">" url "</a></h1>\n"
+	   (cond
+	    ((and exit-status (not (equal exit-status 0)))
+	     (format "<br><br><h2>%s exits with the code %s</h2>\n"
+		     w3m-command exit-status))
+	    (http-status
+	     (format "<br><br><h2>%s %s</h2>\n"
+		     http-status
+		     (or (cdr (assq http-status w3m-http-status-alist))
+			 ""))))))
+    (if (or (null header)
+	    (string-match "\\`w3m: Can't load " header))
+	(progn
+	  (insert errmsg)
+	  (unless http-status
+	    (insert "\
+<br><br>Something seems to be wrong with URL or this system.\n")
+	    (when (string-match "\\`news:" url)
+	      (insert "\
+<br>Also verify the value of the <b>NNTPSERVER</b> environment variable\
+ that should be the address of the <b>NNTP</b> server.\n")))
+	  (save-restriction
+	    (narrow-to-region (point) (point))
+	    (when (w3m-cache-request-contents url)
+	      (w3m-decode-encoded-contents
+	       (setq charset (w3m-content-encoding url)))
+	      (goto-char (point-min))
+	      (insert "<br><br><hr><br>\n<h2>Contents</h2><br>\n"))))
+      (goto-char (point-min))
+      (or (search-forward "<body>" nil t)
+	  (search-forward "<html>" nil t))
+      (unless (bolp) (insert "\n"))
+      (insert errmsg)
+      (save-restriction
+	(narrow-to-region (point) (point))
+	(when (w3m-cache-request-contents url)
+	  (w3m-decode-encoded-contents
+	   (setq charset (w3m-content-encoding url)))
 	  (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"))))
+	  (insert "<br><br><hr><br>\n")
+	  (goto-char (point-max))))
+      (unless (eobp) (insert "<br><br><hr><br>\n"))
+      (when header
+	(or (search-forward "</body>" nil t)
+	    (search-forward "</html>" nil 'max))
+	(unless (bolp) (insert "\n"))
+	(insert "<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
@@ -5170,59 +6328,127 @@
      ; 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 (w3m-real-url url)
+  (setq w3m-current-url (if (w3m-arrived-p url)
+			    (w3m-real-url url)
+			  url)
 	w3m-current-title
 	(if (string= "text/html" type)
-	    (setf (w3m-arrived-title url)
-		  (w3m-rendering-buffer charset))
-	  (or (when (string-match "\\`about://\\(source\\|header\\)/" url)
+	    (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 (buffer-read-only)
+      (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 (buffer-read-only)
+      (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 'face 'w3m-image-face
-				       'w3m-image url
+				 (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)))
+    (let ((cur (current-buffer))
+	  (mb enable-multibyte-characters)
+	  dots cont)
+      (with-temp-buffer
+	(rename-buffer " *Raw Contents*" t)
+	(set-buffer-multibyte mb)
+	(save-window-excursion
+	  (pop-to-buffer (current-buffer))
+	  (delete-other-windows)
+	  (ding)
+
+	  ;; Display the raw contents briefly.
+	  (sit-for 0)
+	  (setq truncate-lines t
+		dots (make-string (/ (- (window-width) 6) 2) ?.))
+	  (with-current-buffer cur
+	    (cond ((< (count-lines (point-min) (point-max)) (window-height))
+		   (setq cont (buffer-string)))
+		  ((< (window-height) 10)
+		   (goto-char (point-min))
+		   (forward-line (max 0 (- (window-height) 2)))
+		   (setq cont
+			 (concat
+			  (buffer-substring (point-min) (point))
+			  "\n[" dots "snip" dots "]")))
+		  (t
+		   (goto-char (point-min))
+		   (forward-line (/ (- (window-height) 4) 2))
+		   (setq cont (concat (buffer-substring (point-min) (point))
+				      "\n[" dots "snip" dots "]\n\n"))
+		   (goto-char (point-max))
+		   (forward-line (/ (- 4 (window-height)) 2))
+		   (setq cont (concat
+			       cont
+			       (buffer-substring (point) (point-max)))))))
+	  (insert cont)
+	  (goto-char (point-min))
+
+	  (setq type
+		(condition-case nil
+		    (completing-read
+		     (format
+		      "%s's content type (default Download or External-View): "
+		      (file-name-nondirectory url))
+		     w3m-content-type-alist nil t)
+		  ;; The user forced terminating the session with C-g.
+		  (quit
+		   (w3m-process-stop page-buffer) ;; Needless?
+		   (with-current-buffer page-buffer
+		     (setq w3m-current-process nil))
+		   (keyboard-quit))))
+	  (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)
@@ -5235,8 +6461,17 @@
     (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)
+    (with-current-buffer page-buffer
+      (setq w3m-current-url (if (w3m-arrived-p url)
+				(w3m-real-url url)
+			      url)))
+    (w3m-doc-view url))
    (t
     (with-current-buffer page-buffer
+      (setq w3m-current-url (if (w3m-arrived-p url)
+				(w3m-real-url url)
+			      url))
       (w3m-external-view url)
       'external-view))))
 
@@ -5274,6 +6509,67 @@
      (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]+\\)\\\">前へ</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]+\\)\\\">次へ</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+]\\)\")'>前へ</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+]\\)\")'>次へ</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."
@@ -5281,85 +6577,118 @@
   (and next
        (re-search-forward next nil t)
        (setq w3m-next-url
-	     (w3m-expand-url (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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 (or (match-string 2)
-				 (match-string 3)
-				 (match-string 1))
+	     (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)
+(defun w3m-search-name-anchor (name &optional quiet no-record)
   (interactive "sName: ")
-  (let ((pos (point-min)))
+  (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 t)))
+	  (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 t)))
+	  (throw 'found (setq found t))))
       (unless quiet
-	(message "No such anchor: %s" name))
-      nil)))
+	(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))))
+      (string-match "\\`[a-z]+://?[^/]+/." w3m-current-url))))
 
-(defun w3m-view-parent-page ()
+(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/\" if you are currently
-viewing \"http://foo/bar/\"."
-  (interactive)
-  (if (null w3m-current-url)
-      (error "w3m-current-url is not set"))
-  (let (parent-url)
-    ;; Check whether http://foo/bar/ or http://foo/bar
-    (if (string-match "/$" w3m-current-url)
-	(if (string-match "\\(.*\\)/[^/]+/$" w3m-current-url)
-	    ;; http://foo/bar/ -> http://foo/
-	    (setq parent-url (concat (match-string 1 w3m-current-url) "/")))
-      (if (string-match "\\(.*\\)/.+$" w3m-current-url)
-	  ;; http://foo/bar -> http://foo/
-	  (setq parent-url (concat (match-string 1 w3m-current-url) "/"))))
-    ;; Ignore "http:/"
-    (if (and parent-url
-	     (string-match "^[a-z]+:/+$" parent-url))
-	(setq parent-url nil))
-    (if parent-url
-	(w3m-goto-url parent-url)
-      (error "No parent page for: %s" w3m-current-url))))
+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))
+  (w3m-history-store-position)
+  (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.
@@ -5374,25 +6703,41 @@
 	(when (> count 0)
 	  (decf count))
       (setq count 0)))
-  (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 nil))
-    (if hist
-	(let ((w3m-prefer-cache t))
-	  (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))
+  (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))
-      (message "There's no more history"))))
+      (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 (caar 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.
@@ -5402,30 +6747,32 @@
   (interactive "p")
   (w3m-view-previous-page (if (integerp count) (- count) -1)))
 
-(eval-and-compile
-  (unless (fboundp 'w3m-expand-path-name)
-    (if w3m-treat-drive-letter
-	;; Avoid incompatibility of drive letters.
-	(defun w3m-expand-path-name (name &optional base)
-	  "Convert path string NAME to the canonicalized one."
-	  ;; cygwin-mount.el destroys `expand-file-name';
-	  ;; (expand-file-name "../index.html" "/foo/bar/")
-	  ;;  => "c:/cygwin/foo/index.html"
-	  (let ((inhibit-file-name-handlers
-		 '(cygwin-mount-name-hook-function
-		   cygwin-mount-map-drive-hook-function))
-		(inhibit-file-name-operation 'expand-file-name)
-		path)
-	    (setq path
-		  (w3m-static-if (featurep 'xemacs)
-		      ;; It is ?\ by default in XEmacs on Windows native.
-		      (let ((directory-sep-char ?/))
-			(expand-file-name name base))
-		    (expand-file-name name base)))
-	    (if (string-match "\\`.:" path)
-		(substring path (match-end 0))
-	      path)))
-      (defalias 'w3m-expand-path-name 'expand-file-name))))
+(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")
@@ -5433,14 +6780,21 @@
 This list is refered to by `w3m-expand-url' to keep backward
 compatibility which is described in Section 5.2 of RFC 2396.")
 
+(defconst w3m-buffer-local-url "buffer://")
+(defun w3m-buffer-local-url-p (url)
+  (save-match-data
+    (string-match (concat "^" w3m-buffer-local-url) url)))
+
 (defun w3m-expand-url (url &optional base)
   "Convert URL to the absolute address, and canonicalize it."
   (save-match-data
     (if base
-	(if (and (string-match w3m-url-components-regexp base)
-		 (match-beginning 1))
+	(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)
+		 (member (downcase (match-string 2 base))
+			 w3m-url-hierarchical-schemes)
 		 (setq base (concat
 			     (substring base 0 (match-end 1))
 			     "//"
@@ -5449,17 +6803,23 @@
       (setq base (or w3m-current-base-url
 		     w3m-current-url
 		     w3m-url-fallback-base)))
-    (string-match w3m-url-components-regexp url)
+    (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)))
-      (string-match w3m-url-components-regexp url))
+      (w3m-string-match-url-components url))
     ;; Remove an empty query part.
     (when (and (match-beginning 6)
-	       (= (match-beginning 7) (length url)))
-      (setq url (substring url 0 (match-beginning 6)))
-      (string-match w3m-url-components-regexp url))
+	       (= (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.
@@ -5470,48 +6830,47 @@
 	  ;; part. => URL has an absolute spec.
 	  url
 	(let ((scheme (match-string 2 url)))
-	  (if (and (member scheme w3m-url-hierarchical-schemes)
-		   (string-match w3m-url-components-regexp base)
-		   (equal scheme (match-string 2 base)))
+	  (if (and (member (downcase 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.
-      (string-match w3m-url-components-regexp base)
+      (w3m-string-match-url-components base)
       (concat (substring base 0 (match-end 1)) url))
      ((> (match-end 5) (match-beginning 5))
-      ;; URL has a hierarchical part.
-      (if (eq ?/ (aref url (match-beginning 5)))
-	  ;; Its first character is the slash "/". => The hierarchical
-	  ;; part of URL has an absolute spec.
-	  (progn
-	    (string-match w3m-url-components-regexp base)
-	    (concat (substring base 0 (or (match-end 3) (match-end 1)))
-		    url))
-	;; The hierarchical part of URL has a relative spec.
-	(let ((path-end (match-end 5))
-	      ;; 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)
-	  (string-match w3m-url-components-regexp base)
+      (let ((path-end (match-end 5)))
+	(if (string-equal base w3m-buffer-local-url)
+	    (if (eq (aref url 0) ?#)
+		(concat base url)
+	      ;; Assume url omits the scheme, that is http.
+	      (concat "http://" url))
+	  (w3m-string-match-url-components base)
 	  (concat
 	   (substring base 0 (match-beginning 5))
-	   (if (member (match-string 2 base) w3m-url-hierarchical-schemes)
+	   (if (and (match-beginning 2)
+		    (member (downcase (match-string 2 base))
+			    w3m-url-hierarchical-schemes))
 	       (w3m-expand-path-name
 		(substring url 0 path-end)
-		(file-name-directory (match-string 5 base)))
+		(or
+		 ;; Avoid file name handlers; cf.
+		 ;; http://news.gmane.org/group/gmane.emacs.w3m/thread=4210
+		 (let (file-name-handler-alist)
+		   (file-name-directory (match-string 5 base)))
+		 "/"))
 	     (substring url 0 path-end))
 	   (substring url path-end)))))
      ((match-beginning 6)
       ;; URL has a query part.
-      (string-match w3m-url-components-regexp base)
-      (concat (file-name-directory (substring base 0 (match-end 5)))
-	      url))
+      (w3m-string-match-url-components base)
+      (concat (substring base 0 (match-end 5)) url))
      (t
       ;; URL has only a fragment part.
-      (string-match w3m-url-components-regexp base)
+      (w3m-string-match-url-components base)
       (concat (substring base 0 (match-beginning 8))
 	      url)))))
 
@@ -5527,59 +6886,49 @@
   (put-text-property (point) (point-max) 'w3m-progress-message t)
   (sit-for 0))
 
-(defsubst w3m-view-this-url-1 (url reload new-session)
-  (lexical-let (pos buffer newbuffer wconfig)
+(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 settion, otherwise
+	       ;; the buffer's contents to the new session, otherwise
 	       ;; creating an empty buffer.
-	       (not (and (string-match w3m-url-components-regexp url)
-			 (match-beginning 8)
+	       (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 w3m-view-this-url-new-session-in-background
-			empty))
-	  (when w3m-view-this-url-new-session-in-background
+			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
-	   (save-window-excursion
-	     (prog1
-		 (w3m-goto-url url reload nil nil w3m-current-url handler)
-	       (setq newbuffer (current-buffer)
-		     wconfig (current-window-configuration)))))
-	;; When 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, etc.), we need to make the new buffer visible.
-	(when (and (eq (with-current-buffer buffer major-mode)
-		       'w3m-mode)
-		   (not (eq (with-current-buffer newbuffer major-mode)
-			    'w3m-mode)))
-	  ;; Empty buffer must delete before restore window configuration.
-	  (when pos
-	    (w3m-delete-buffer-if-empty buffer))
-	  (set-window-configuration wconfig))
-	;; The new session is created.
-	(when pos
-	  ;; Already empty buffer killed if the new url is not the w3m-mode.
-	  (when (buffer-name buffer)
-	    (w3m-delete-buffer-if-empty buffer))
+	  (success (w3m-goto-url url reload nil nil w3m-current-url handler
+				 nil w3m-new-session-in-background))
+	(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 (buffer-name (marker-buffer pos))
-	    (save-excursion
-	      (set-buffer (marker-buffer pos))
+	  (when (and (marker-buffer pos) (buffer-name (marker-buffer pos)))
+	    (with-current-buffer (marker-buffer pos)
 	      (save-excursion
 		(goto-char pos)
-		(w3m-refontify-anchor)))))))))
+		(w3m-refontify-anchor)))))
+	(w3m-recenter)))))
 
 (defun w3m-view-this-url (&optional arg new-session)
   "Display the page pointed to by the link under point.
@@ -5591,21 +6940,28 @@
   (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
-	     (string-match "\\`about://\\(db-\\)?history/" w3m-current-url)))
+	     (and (stringp w3m-current-url)
+		  (string-match "\\`about://\\(?:db-\\)?history/"
+				w3m-current-url))))
 	act url)
     (cond
      ((setq act (w3m-action))
-      (eval act))
+      (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))
-      (unless (eq 'quit (setq url (w3m-input-url nil url 'quit)))
+     ((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")))))
 
@@ -5635,10 +6991,11 @@
       (setq urls (list url)))
     (save-excursion
       (goto-char start)
-      (setq all (not (and (bolp)
-			  w3m-current-url
-			  (string-match "\\`http://\\([^/]+\\.\\)*google\\."
-					w3m-current-url))))
+      (setq all (not
+		 (and (bolp)
+		      w3m-current-url
+		      (string-match "\\`https?://\\(?:[^/]+\\.\\)*google\\."
+				    w3m-current-url))))
       (while (progn
 	       (w3m-next-anchor)
 	       (and (> (point) prev)
@@ -5649,6 +7006,7 @@
 		   (or all
 		       (bolp)))
 	  (push url urls))))
+    (setq urls (nreverse urls))
     (while urls
       (setq url (car urls)
 	    urls (cdr urls))
@@ -5670,14 +7028,19 @@
   (mouse-set-point event)
   (w3m-view-this-url nil t))
 
-(defun w3m-submit-form ()
+(defun w3m-submit-form (&optional new-session)
   "Submit the form at point."
-  (interactive)
+  (interactive "P")
   (let ((submit (w3m-submit)))
     (if (and submit
 	     w3m-current-url
-	     (w3m-url-valid w3m-current-url))
-	(eval submit)
+	     (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)
@@ -5687,7 +7050,14 @@
       (w3m-process-do
 	  (type (w3m-content-type url no-cache handler))
 	(when type
-	  (lexical-let ((method (nth 2 (assoc type w3m-content-type-alist))))
+	  (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))))
+			(default
+			  (nth 2 (assoc "text/html" w3m-content-type-alist))))
+	    (when (and (not method) default)
+	      (setq method default))
 	    (cond
 	     ((not method)
 	      (if (w3m-url-local-p url)
@@ -5740,13 +7110,14 @@
 	    (set-process-sentinel
 	     proc
 	     (lambda (proc event)
-	       (and (string-match "^\\(finished\\|exited\\)" event)
-		    (buffer-name (process-buffer proc))
-		    (with-current-buffer (process-buffer proc)
-		      (and (stringp file)
-			   (file-exists-p file)
-			   (delete-file file)))
-		    (kill-buffer (process-buffer proc))))))
+	       (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)
@@ -5772,61 +7143,156 @@
 	(w3m-download url)
       (w3m-message "No image at point"))))
 
-(defun w3m-view-url-with-external-browser ()
+(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)
-  (let ((url (or (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"))))
+  (interactive (list (w3m-input-url "URL to view externally: "
+				    (or (w3m-anchor)
+					(unless w3m-display-inline-images
+					  (w3m-image))
+					w3m-current-url)
+				    "")))
+  (when (w3m-url-valid url)
+    (message "Browsing <%s>..." url)
+    (w3m-external-view url)))
 
 (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))))
-    (if (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))
-		   (save-excursion
-		     (set-buffer (marker-buffer pos))
-		     (when (equal curl w3m-current-url)
-		       (goto-char pos)
-		       (w3m-refontify-anchor)))))))
-      (w3m-message "No URL at point"))))
+  (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
-    (kill-new w3m-current-url)
-    (w3m-message "%s" (w3m-url-readable-string w3m-current-url))))
+    (let ((deactivate-mark nil))
+      (kill-new (w3m-url-encode-string-2 w3m-current-url))
+      (w3m-message "%s" (w3m-url-readable-string w3m-current-url)))))
+
+(defvar message-truncate-lines)
 
 (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 ((url (if interactive-p
-		 (or (w3m-anchor) (w3m-image))
-	       (or (w3m-anchor (point)) (w3m-image (point))))))
+  (let ((deactivate-mark nil)
+	(url (if interactive-p
+		 (or (w3m-anchor)
+		     (w3m-image)
+		     (and (stringp w3m-current-url)
+			  (let ((name (or (car (get-text-property
+						(point) 'w3m-name-anchor))
+					  (car (get-text-property
+						(point)
+						'w3m-name-anchor2)))))
+			    (when name
+			      (concat w3m-current-url "#" name)))))
+	       (or (w3m-anchor (point)) (w3m-image (point)))))
+	(alt (if interactive-p
+		 (w3m-image-alt)
+	       (w3m-image-alt (point))))
+	(title (if interactive-p
+		   (w3m-anchor-title)
+		 (w3m-anchor-title (point)))))
+    (when (or url interactive-p)
+      (and url interactive-p (kill-new (w3m-url-encode-string-2 url)))
+      (setq url (or (w3m-url-readable-string url)
+		    (and (w3m-action) "There is a form")
+		    "There is no url under point"))
+      (w3m-message "%s" (cond
+			 ((> (length alt) 0)
+			  (concat alt ": " url))
+			 ((> (length title) 0)
+			  ;; XEmacs21 doesn't have `message-truncate-lines'
+			  ;; and always truncates messages, so one line in
+			  ;; that case.
+			  (let ((str (concat title " (" url ")")))
+			    (if (or (not (boundp 'message-truncate-lines))
+				    message-truncate-lines
+				    (< (string-width str) (- (frame-width) 2)))
+				;; one line if fits or truncating
+				str
+			      ;; or two lines if bigger than frame-width
+			      (concat title "\n" url))))
+			 (t
+			  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"
+      (and url interactive-p (kill-new (w3m-url-encode-string-2 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")))))
+		       "There is no image url under point")))))
 
 (defmacro w3m-delete-all-overlays ()
   "Delete all momentary overlays."
@@ -5837,8 +7303,7 @@
 (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 (save-excursion (end-of-line)
-			       (point)))
+  (let ((limit (point-at-eol))
 	ov beg pos pseq)
     (save-excursion
       (beginning-of-line)
@@ -5851,7 +7316,7 @@
 	(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-face)
+	(overlay-put ov 'face 'w3m-current-anchor)
 	(overlay-put ov 'w3m-momentary-overlay t)
 	(overlay-put ov 'evaporate t)
 	t))))
@@ -5883,7 +7348,7 @@
 (defun w3m-edit-url (url)
   "Edit the page pointed by URL."
   (interactive (list (w3m-input-url)))
-  (when (string-match "\\`about://\\(header\\|source\\)/" url)
+  (when (string-match "\\`about://\\(?:header\\|source\\)/" url)
     (setq url (substring url (match-end 0))))
   (catch 'found
     (dolist (pair w3m-edit-function-alist)
@@ -5940,18 +7405,19 @@
       (setcdr w3m-goto-anchor-hist nil)))
   (if (< arg 0)
       (w3m-previous-anchor (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-next-anchor)
-	(setq w3m-goto-anchor-hist nil)
-	(if (w3m-imitate-widget-button)
-	    (widget-forward 1)
-	  ;; Make a search from the beginning of the buffer.
-	  (goto-char (point-min))
-	  (w3m-goto-next-anchor)))
-      (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)))
+    (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)))
 
@@ -5989,18 +7455,22 @@
       (setcdr w3m-goto-anchor-hist nil)))
   (if (< arg 0)
       (w3m-next-anchor (- arg))
-    (while (> arg 0)
-      (unless (w3m-goto-previous-anchor)
-	(setq w3m-goto-anchor-hist nil)
-	(if (w3m-imitate-widget-button)
-	    (widget-forward -1)
-	  ;; Make a search from the end of the buffer.
-	  (goto-char (point-max))
-	  (w3m-goto-previous-anchor)))
-      (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)))
+    (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)))
 
@@ -6154,7 +7624,7 @@
     (w3m-horizontal-on-screen)
     (w3m-print-this-url)))
 
-(defun w3m-copy-buffer (&optional buffer newname just-copy empty)
+(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.
 
@@ -6164,13 +7634,15 @@
 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.
+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: "))))
+		     (if current-prefix-arg (read-string "Name: "))
+		     t))
   (unless buffer
     (setq buffer (current-buffer)))
   (unless newname
@@ -6186,22 +7658,30 @@
 	    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 (generate-new-buffer newname)))
+      (w3m-history-store-position)
+      (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-initial-frames init-frames
+      (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)))
-    (if (and (not just-copy) empty)
-	;; Pop to a window or a frame up because `w3m-goto-url' is not called.
-	(w3m-popup-buffer new)
+    (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))
-    (unless empty
+      (set-buffer new)
       ;; Render a page.
       (let ((positions (copy-sequence (car w3m-history)))
 	    (w3m-history-reuse-history-elements t)
@@ -6211,20 +7691,26 @@
 			;; Pass the properties of the history elements,
 			;; although it is currently always nil.
 			(w3m-history-element (cadr positions))))
-	(setcar w3m-history 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 (zerop arg)
-    (let ((buffers (if (> arg 0)
-		       (w3m-list-buffers)
-		     (setq arg (- arg))
-		     (nreverse (w3m-list-buffers)))))
+  (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
-       (or (nth arg (memq (current-buffer) buffers))
-	   (nth (1- arg) buffers))))
+       (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)))
 
@@ -6239,14 +7725,20 @@
 terminating the emacs-w3m session; the prefix argument FORCE will be
 passed to the `w3m-quit' function (which see)."
   (interactive "P")
-  (let* ((buffers (w3m-list-buffers t))
+  ;; 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)
-	  (w3m-next-buffer -1)
+	  (progn
+	    (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)
@@ -6292,12 +7784,20 @@
 		   (w3m-next-buffer -1)
 		 (unless (one-window-p t)
 		   (delete-window))))))
+      (w3m-session-deleted-save (list cur))
       (w3m-process-stop cur)
-      (kill-buffer cur)
+      (w3m-idle-images-show-unqueue cur)
+      (let ((frame-auto-delete nil)
+	    (ignore-window-parameters t))
+	(kill-buffer cur))
       (when w3m-use-form
 	(w3m-form-kill-buffer cur))
-      (run-hooks 'w3m-delete-buffer-hook)))
-  (w3m-select-buffer-update))
+      (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.
@@ -6321,14 +7821,14 @@
 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)
+  (let ((count 1) number newname)
     (dolist (buffer (w3m-list-buffers))
       (setq number (w3m-buffer-number buffer))
       (when number
 	(unless (eq number count)
-	  (when (and (w3m-buffer-set-number buffer count)
+	  (when (and (setq newname (w3m-buffer-set-number buffer count))
 		     w3m-use-form)
-	    (w3m-form-set-number buffer count)))
+	    (w3m-form-set-number buffer newname)))
 	(incf count)))))
 
 (defun w3m-delete-other-buffers (&optional buffer)
@@ -6338,17 +7838,110 @@
     (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-select-buffer-update))
+  (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-e" 'w3m-goto-new-session-url)
+    (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)
+    (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-lnum-map nil
+  "Sub-keymap used for the `L'-prefixed link numbering commands.")
+(unless w3m-lnum-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "f" 'w3m-lnum-follow)
+    (define-key map "F" 'w3m-lnum-goto)
+    (define-key map "w" 'w3m-lnum-universal)
+    (define-key map "I" 'w3m-lnum-view-image)
+    (define-key map "\M-i" 'w3m-lnum-save-image)
+    (define-key map "d" 'w3m-lnum-download-this-url)
+    (define-key map "e" 'w3m-lnum-edit-this-url)
+    (define-key map "t" 'w3m-lnum-toggle-inline-image)
+    (define-key map "u" 'w3m-lnum-print-this-url)
+    (define-key map "b" 'w3m-lnum-bookmark-add-this-url)
+    (define-key map "]" 'w3m-lnum-zoom-in-image)
+    (define-key map "[" 'w3m-lnum-zoom-out-image)
+    (setq w3m-lnum-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)
@@ -6358,20 +7951,19 @@
     (define-key map [delete] 'w3m-scroll-down-or-previous-url)
     (if (featurep 'xemacs)
 	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      ;; Note: It does not have an effect on Emacs 19.
       (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" (lambda () (interactive) (scroll-up 1)))
+    (define-key map "J" 'w3m-scroll-up)
     (define-key map "K" (lambda () (interactive) (scroll-down 1)))
-    (define-key map "\M-g" 'goto-line)
     (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)
@@ -6379,25 +7971,29 @@
     (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.
+      ;; 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 "\C-c\C-@" 'w3m-history-store-position)
-    (if (featurep 'xemacs)
-	(define-key map [?\C-c (control space)] 'w3m-history-store-position)
-      ;; `C- ' doesn't mean `C-SPC' in XEmacs.
-      (define-key map [?\C-c ?\C-\ ] 'w3m-history-store-position))
-    (define-key map "\C-c\C-v" 'w3m-history-restore-position)
     (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)
@@ -6406,30 +8002,29 @@
     (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 "\C-tt" 'w3m-create-empty-session)
     (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-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 "\C-c\C-t" 'w3m-copy-buffer)
-    (define-key map "\C-c\C-p" 'w3m-previous-buffer)
-    (define-key map "\C-c\C-n" 'w3m-next-buffer)
-    (define-key map "\C-c\C-w" 'w3m-delete-buffer)
-    (define-key map "\C-c\M-w" 'w3m-delete-other-buffers)
-    (define-key map "\C-c\C-s" 'w3m-select-buffer)
-    (define-key map "\C-c\C-a" 'w3m-switch-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)
@@ -6452,17 +8047,16 @@
     (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 "C" (make-sparse-keymap))
-    (define-key map "Ct" 'w3m-redisplay-with-content-type)
-    (define-key map "Cc" 'w3m-redisplay-with-charset)
-    (define-key map "CC" 'w3m-redisplay-and-reset)
-    (define-key map "\C-c\C-b" 'report-emacs-w3m-bug)
-    (define-key map "\C-c\C-c" 'w3m-submit-form)
-    (define-key map "\C-c\C-k" 'w3m-process-stop)
+    (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-lnum-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)
@@ -6471,12 +8065,12 @@
     (define-key map "\C-?" 'w3m-scroll-down-or-previous-url)
     (if (featurep 'xemacs)
 	(define-key map [(shift space)] 'w3m-scroll-down-or-previous-url)
-      ;; Note: It does not have an effect on Emacs 19.
       (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)
@@ -6487,14 +8081,21 @@
 	  (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.
+      ;; 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 "\C-c\C-@" 'w3m-history-store-position)
-    (define-key map [?\C-c?\C- ] 'w3m-history-store-position)
-    (define-key map "\C-c\C-v" 'w3m-history-restore-position)
+    (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)
@@ -6506,14 +8107,15 @@
     (define-key map "E" 'w3m-edit-this-url)
     (define-key map "f" 'undefined) ;; reserved.
     (define-key map "g" 'w3m-goto-url)
-    (define-key map "\M-g" 'goto-line)
     (define-key map "G" 'w3m-goto-url-new-session)
+    (define-key map "\C-tt" 'w3m-create-empty-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))
@@ -6521,18 +8123,14 @@
     (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 "\C-c\C-t" 'w3m-copy-buffer)
-    (define-key map "\C-c\C-p" 'w3m-previous-buffer)
-    (define-key map "\C-c\C-n" 'w3m-next-buffer)
-    (define-key map "\C-c\C-w" 'w3m-delete-buffer)
-    (define-key map "\C-c\M-w" 'w3m-delete-other-buffers)
-    (define-key map "\C-c\C-s" 'w3m-select-buffer)
-    (define-key map "\C-c\C-a" 'w3m-switch-buffer)
+    (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)
@@ -6541,14 +8139,13 @@
     (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" (lambda ()
-			  (interactive)
-			  (let ((current-prefix-arg t))
-			    (call-interactively '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)
@@ -6568,13 +8165,10 @@
     (define-key map "[" 'w3m-previous-form)
     (define-key map "}" 'w3m-next-image)
     (define-key map "{" 'w3m-previous-image)
-    (define-key map "C" (make-sparse-keymap))
-    (define-key map "Ct" 'w3m-redisplay-with-content-type)
-    (define-key map "Cc" 'w3m-redisplay-with-charset)
-    (define-key map "CC" 'w3m-redisplay-and-reset)
-    (define-key map "\C-c\C-b" 'report-emacs-w3m-bug)
-    (define-key map "\C-c\C-c" 'w3m-submit-form)
-    (define-key map "\C-c\C-k" 'w3m-process-stop)
+    (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-lnum-map)
     (setq w3m-info-like-map map)))
 
 (defun w3m-alive-p (&optional visible)
@@ -6603,25 +8197,36 @@
 is specified, otherwise prompt you for the confirmation.  See also
 `w3m-close-window'."
   (interactive "P")
-  (when (or force
-	    (prog1 (y-or-n-p "Do you want to exit w3m? ")
-	      (w3m-message "")))
-    (w3m-delete-frames-and-windows)
-    (sit-for 0) ;; Delete frames seemingly fast.
-    (dolist (buffer (w3m-list-buffers t))
-      (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)))
+  (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).
@@ -6629,6 +8234,9 @@
 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)
@@ -6644,13 +8252,16 @@
 	(setq window (pop windows))
 	(set-window-buffer
 	 window
-	 (w3m-static-cond ((featurep 'xemacs)
-			   (other-buffer buf (window-frame window) nil))
-			  ((>= emacs-major-version 20)
-			   (other-buffer buf nil (window-frame window)))
-			  (t
-			   (other-buffer buf)))))))
-  (w3m-select-buffer-close-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
@@ -6658,22 +8269,210 @@
 	    w3m-info-like-map
 	  w3m-lynx-like-map)))
 
-(defun w3m-clean-hook-options ()
-  "Remove the functions which should be set newly from some hooks."
-  (dolist (elem '((w3m-mode-hook w3m-setup-header-line
-				 w3m-setup-widget-faces
-				 w3m-update-tab-line)
-		  (w3m-fontify-after-hook w3m-header-line-insert
-					  w3m-update-tab-line)
-		  (w3m-display-hook w3m-select-buffer-update
-				    w3m-favicon-setup
-				    w3m-xmas-update-tab-in-gutter)
-		  (w3m-delete-buffer-hook w3m-select-buffer-update
-					  w3m-update-tab-line)))
-    (dolist (func (cdr elem))
-      (when (memq func (symbol-value (car elem)))
-	(message "Remove `%s' from `%s'" func (car elem))
-	(remove-hook (car elem) func)))))
+(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 "新しいタブ" "New Tab")
+       t ,w3m-new-session-in-background w3m-new-session-url)
+      (w3m-copy-buffer
+       ,(w3m-make-menu-item "タブを複製" "Copy Tab")
+       ,currentp ,w3m-new-session-in-background)
+      -
+      (w3m-reload-this-page
+       ,(w3m-make-menu-item "タブを再読み込み" "Reload Tab")
+       ,currentp)
+      (w3m-reload-all-pages
+       ,(w3m-make-menu-item "すべてのタブを再読み込み" "Reload All Tabs")
+       ,manyp)
+      -
+      (w3m-delete-buffer
+       ,(w3m-make-menu-item "このタブを閉じる" "Close This Tab")
+       ,currentp)
+      -
+      (w3m-delete-other-buffers
+       ,(w3m-make-menu-item "他のタブをすべて閉じる" "Close Other Tabs")
+       ,many2p)
+      (w3m-delete-left-tabs
+       ,(w3m-make-menu-item "左側のタブをすべて閉じる" "Close Left Tabs")
+       ,leftp)
+      (w3m-delete-right-tabs
+       ,(w3m-make-menu-item "右側のタブをすべて閉じる" "Close Right Tabs")
+       ,rightp)
+      -
+      (w3m-view-url-with-external-browser
+       ,(w3m-make-menu-item "外部ブラウザで開く" "View with external browser")
+       ,currentp ,w3m-new-session-in-background w3m-current-url)
+      -
+      (w3m-session-save
+       ,(w3m-make-menu-item "すべてのタブを保存する" "Save All Tabs...")
+       t)
+      (w3m-session-select
+       ,(w3m-make-menu-item "タブリストを選択する" "Select List of Tabs...")
+       t)
+      (w3m-bookmark-add-current-url
+       ,(w3m-make-menu-item "このタブをブックマーク" "Bookmark This Tab...")
+       ,currentp ,w3m-new-session-in-background)
+      (w3m-bookmark-add-all-urls
+       ,(w3m-make-menu-item
+	 "すべてのタブをブックマーク" "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 "リンクをこのセッションで開く"
+			  "Open Link in This Session")
+     w3m-view-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "リンクを新しいセッションで開く"
+			  "Open Link in New Session")
+     w3m-view-this-url-new-session (w3m-anchor (point))]
+    [,(w3m-make-menu-item "リンクを外部ブラウザで開く"
+			  "Open Link in an External Browser")
+     w3m-external-view-this-url (w3m-anchor (point))]
+    "-"
+    [,(w3m-make-menu-item "このリンクをブックマーク..."
+			  "Bookmark This Link...")
+     w3m-bookmark-add-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "名前を付けてリンク先を保存..."
+			  "Save Link As...")
+     w3m-download-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "名前を付けて画像を保存..."
+			  "Save Image As...")
+     w3m-download-this-image (w3m-image (point))]
+    [,(w3m-make-menu-item "リンクの URL をコピー"
+			  "Copy Link Location")
+     w3m-print-this-url (w3m-anchor (point))]
+    [,(w3m-make-menu-item "画像の URL をコピー"
+			  "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-make-local-hook 'pre-command-hook)
+  (add-hook 'pre-command-hook 'w3m-set-buffer-seen nil t))
+
+(defun w3m-set-buffer-seen ()
+  (setq w3m-buffer-unseen nil)
+  (remove-hook 'pre-command-hook 'w3m-set-buffer-seen t))
+
+(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.
@@ -6698,6 +8497,7 @@
 \\[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.
@@ -6720,15 +8520,27 @@
 
 \\[w3m-goto-url]	Visit the web page.
 \\[w3m-goto-url-new-session]	Visit the web page in a new session.
+\\[w3m-goto-new-session-url]	Open page of which url is specified by\
+ `w3m-new-session-url' in\n\ta 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-this-url]	Download the file or the page under point.
+\\[w3m-delete-left-tabs]	Delete tabs on the left side of\
+ the current tab.
+\\[w3m-delete-right-tabs]	Delete tabs on the right side of\
+ the current tab.
+\\[w3m-tab-move-left]	Move this tab N (default 1) times to the left.
+\\[w3m-tab-move-right]	Move this tab N (default 1) times to the right.
+
+\\[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-image]	Toggle the visibility of an image under point.
 \\[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.
 
@@ -6743,11 +8555,14 @@
  page.
 \\[w3m-edit-this-url]	Edit the local file which is pointed to by URL under\
  point.
+\\[w3m-cookie]	Display cookies and enable you to manage them.
 
 \\[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-up]	Scroll the current window up one line (or lines\
+ of which the number\n\tyou specify by the prefix argument).
 \\[w3m-scroll-left]	Scroll to the left.
 \\[w3m-scroll-right]	Scroll to the right.
 \\[w3m-shift-left]	Shift to the left.
@@ -6775,22 +8590,31 @@
 \\[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-pipe-source]	Pipe a page source to a shell command.
 
 \\[w3m-bookmark-view]	Display the bookmark.
-\\[w3m-bookmark-add-current-url]	Add the url of the current page to\
+\\[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-create-empty-session]	Create an empty page as a new session and\
+ visit it.
 \\[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-move-unseen-buffer]	Move to the next unseen buffer.
 \\[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.
@@ -6801,8 +8625,11 @@
 \\[w3m-close-window]	Close all emacs-w3m windows, without deleteing\
  buffers.
 \\[w3m-quit]	Exit browsing web.  All emacs-w3m buffers will be deleted.
+\\[w3m-process-stop]	Try to stop internal processes of a page.
 
 \\[describe-mode]	describe-mode.
+\\[w3m-mouse-major-mode-menu]	Pop up a w3m-mode specific menu of mouse\
+ commands.
 
 \\[report-emacs-w3m-bug]	Send a bug report to the emacs-w3m team.
 "
@@ -6811,7 +8638,10 @@
   (setq major-mode 'w3m-mode)
   (setq mode-name "w3m")
   (use-local-map w3m-mode-map)
-  (setq truncate-lines t
+  ;; Force paragraph direction to be left-to-right.  Don't make it
+  ;; bound globally in old Emacsen and XEmacsen.
+  (set (make-local-variable 'bidi-paragraph-direction) 'left-to-right)
+  (setq	truncate-lines t
 	w3m-display-inline-images w3m-default-display-inline-images)
   (when w3m-auto-show
     (when (boundp 'auto-hscroll-mode)
@@ -6823,67 +8653,193 @@
     (when (boundp 'hscroll-mode)
       (set (make-local-variable 'hscroll-mode) nil)))
   (make-local-variable 'list-buffers-directory)
-  (w3m-clean-hook-options)
+  (w3m-static-unless (featurep 'xemacs)
+    (setq show-trailing-whitespace nil))
+  (when (boundp 'mwheel-scroll-up-function)
+    (eval '(set (make-local-variable (quote mwheel-scroll-up-function))
+		(function w3m-mwheel-scroll-up)))
+    (eval '(set (make-local-variable (quote mwheel-scroll-down-function))
+		(function w3m-mwheel-scroll-down))))
   (w3m-setup-toolbar)
   (w3m-setup-menu)
   (run-hooks 'w3m-mode-setup-functions)
-  (run-hooks 'w3m-mode-hook))
+  (w3m-run-mode-hooks 'w3m-mode-hook))
+
+(condition-case nil
+    (define-obsolete-function-alias 'w3m-scroll-up-1 'w3m-scroll-up
+      "2013-01-23")
+  (wrong-number-of-arguments ;; XEmacs
+   (define-obsolete-function-alias 'w3m-scroll-up-1 'w3m-scroll-up)))
+(defun w3m-scroll-up (&optional arg mwheel)
+  "Scroll the current window up ARG lines.
+ARG will be fixed into 1 when this function is called interactively.
+MWHEEL indicates that this function is called by the mouse wheel.
+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))
+  (let ((cur (point))
+	end)
+    (goto-char (point-max))
+    (skip-chars-backward "\t\n\r ")
+    (forward-line 1)
+    (setq end (point))
+    (goto-char cur)
+    (if (and (or mwheel (not arg))
+	     (pos-visible-in-window-p end))
+	(run-with-timer 1e-9 nil
+			(lambda (win pos)
+			  (when (window-live-p win)
+			    (goto-char pos)
+			    (recenter -1)
+			    (w3m-message "End of buffer")))
+			(selected-window) end)
+      (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)
+      (when (and truncate-lines
+		 (or mwheel (not arg))
+		 (pos-visible-in-window-p end))
+	(setq cur (point))
+	(goto-char end)
+	(recenter -1)
+	(goto-char cur)))))
+
+(defun w3m-mwheel-scroll-up (&optional arg)
+  (w3m-scroll-up arg t))
 
 (defun w3m-scroll-up-or-next-url (arg)
   "Scroll the current window up ARG lines, or go to the next page."
   (interactive "P")
-  (w3m-keep-region-active)
-  (if (pos-visible-in-window-p (point-max))
-      (if w3m-next-url
-	  (w3m-goto-url w3m-next-url)
-	(signal 'end-of-buffer nil))
-    (scroll-up arg)))
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-up arg)
+    (w3m-keep-region-active)
+    (if (and w3m-next-url
+	     (pos-visible-in-window-p (let ((cur (point)))
+					(goto-char (point-max))
+					(skip-chars-backward "\t\n\r ")
+					(forward-line 1)
+					(prog1
+					    (point)
+					  (goto-char cur)))))
+	(let ((w3m-prefer-cache t))
+	  (w3m-history-store-position)
+	  (w3m-goto-url w3m-next-url))
+      (w3m-scroll-up arg))))
+
+(defun w3m-scroll-down (&optional arg mwheel)
+  "Scroll the current window down ARG lines.
+ARG will be fixed into 1 when this function is called interactively.
+MWHEEL indicates that this function is called by the mouse wheel."
+  (interactive '(1))
+  (if (and (or mwheel (not arg))
+	   (pos-visible-in-window-p (point-min)))
+      (run-with-timer 1e-9 nil
+		      (lambda (win)
+			(when (window-live-p win)
+			  (select-window win)
+			  (goto-char (point-min))
+			  (recenter 0)
+			  (w3m-message "Beginning of buffer")))
+		      (selected-window))
+    (scroll-down arg)))
+
+(defun w3m-mwheel-scroll-down (&optional arg)
+  (w3m-scroll-down arg t))
 
 (defun w3m-scroll-down-or-previous-url (arg)
   "Scroll the current window down ARG lines, or go to the previous page."
   (interactive "P")
-  (w3m-keep-region-active)
-  (if (pos-visible-in-window-p (point-min))
-      (if w3m-previous-url
-	  (w3m-goto-url w3m-previous-url)
-	(signal 'beginning-of-buffer nil))
-    (scroll-down arg)))
+  (if (w3m-image-page-displayed-p)
+      (image-scroll-down arg)
+    (w3m-keep-region-active)
+    (if (and w3m-previous-url
+	     (pos-visible-in-window-p (point-min)))
+	(let ((w3m-prefer-cache t))
+	  (w3m-history-store-position)
+	  (w3m-goto-url w3m-previous-url))
+      (w3m-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")
-  (w3m-horizontal-scroll 'left (if arg
-				   (prefix-numeric-value arg)
-				 w3m-horizontal-scroll-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-scroll-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-forward-hscroll arg)
+    (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 arg))))
 
 (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")
-  (w3m-horizontal-scroll 'right (if arg
-				    (prefix-numeric-value arg)
-				  w3m-horizontal-scroll-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-scroll-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-backward-hscroll arg)
+    (if (zerop (window-hscroll))
+	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	  (ding))
+      (w3m-horizontal-scroll 'right arg))))
 
 (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")
-  (w3m-horizontal-scroll 'left (if arg
-				   (prefix-numeric-value arg)
-				 w3m-horizontal-shift-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-shift-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-forward-hscroll arg)
+    (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 arg))))
 
 (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")
-  (w3m-horizontal-scroll 'right (if arg
-				    (prefix-numeric-value arg)
-				  w3m-horizontal-shift-columns)))
+  (setq arg (if arg (prefix-numeric-value arg) w3m-horizontal-shift-columns))
+  (if (w3m-image-page-displayed-p)
+      (image-backward-hscroll arg)
+    (if (zerop (window-hscroll))
+	(when (memq last-command '(w3m-scroll-right w3m-shift-right))
+	  (ding))
+      (w3m-horizontal-scroll 'right arg))))
 
 (defvar w3m-horizontal-scroll-done nil)
 (make-variable-buffer-local 'w3m-horizontal-scroll-done)
@@ -6898,10 +8854,15 @@
 	     (not (and (eq last-command this-command)
 		       (or (eq (point) (point-min))
 			   (eq (point) (point-max)))))
-	     (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))))
+	     (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))
 
@@ -6993,42 +8954,54 @@
 		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")
-  (w3m-keep-region-active)
-  (when (listp arg)
-    (setq arg (car arg)))
-  (set-window-hscroll (selected-window) 0)
-  (beginning-of-line arg))
+  (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")
-  (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)
+  (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 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)))
+	    (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."
@@ -7054,7 +9027,8 @@
 
 (defun w3m-goto-mailto-url (url &optional post-data)
   (let ((before (nreverse (buffer-list)))
-	comp info buffers buffer function)
+	comp info body buffers buffer function)
+    (setq url (w3m-decode-entities-string (w3m-url-decode-string url)))
     (save-window-excursion
       (if (and (symbolp w3m-mailto-url-function)
 	       (fboundp w3m-mailto-url-function))
@@ -7068,27 +9042,28 @@
 		     (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)))
+	    ;; Use rfc2368.el
 	    (progn
-	      (setq info (rfc2368-parse-mailto-url url))
+	      (setq info (rfc2368-parse-mailto-url url)
+		    body (assoc "Body" info)
+		    info (delq body info)
+		    body (delq nil (list (cdr body))))
+	      (when post-data
+		(setq body (nconc body (list (if (consp post-data)
+						 (car post-data)
+					       post-data)))))
 	      (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.
+		     (append (mapcar
+			      (lambda (x)
+				(prog1
+				    (cdr (assoc x info))
+				  (setq info (delq (assoc x info) info))))
+			      '("To" "Subject"))
+			     (list info))))
+	  ;; W/o rfc2368.el
+	  (string-match ":\\([^?]+\\)" url)
 	  (funcall comp (match-string 1 url)))))
     (setq buffers (nreverse (buffer-list)))
     (save-current-buffer
@@ -7102,14 +9077,25 @@
 				 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)))))
+      (let (same-window-buffer-names same-window-regexps mod)
+	(w3m-static-if (boundp 'display-buffer-alist)
+	    (let (display-buffer-alist)
+	      (funcall function buffer))
+	  (let (special-display-buffer-names special-display-regexps)
+	    (funcall function buffer)))
+	(when body
+	  (setq mod (buffer-modified-p))
+	  (goto-char (point-min))
+	  (search-forward (concat "\n" (regexp-quote mail-header-separator)
+				  "\n") nil 'move)
+	  (unless (bolp) (insert "\n"))
+	  (while body
+	    (insert (pop body))
+	    (unless (bolp) (insert "\n")))
+	  (set-buffer-modified-p mod))))))
 
 (defun w3m-convert-ftp-url-for-emacsen (url)
-  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(/~/\\)?" url)
+  (or (and (string-match "^ftp://?\\([^/@]+@\\)?\\([^/]+\\)\\(?:/~/\\)?" url)
 	   (concat "/"
 		   (if (match-beginning 1)
 		       (substring url (match-beginning 1) (match-end 1))
@@ -7157,7 +9143,7 @@
 			     (y-or-n-p
 			      (format "File(%s) already exists. Overwrite? "
 				      filename))
-			   (w3m-message ""))
+			   (message nil))
 			 (progn
 			   (delete-file filename)
 			   t))
@@ -7165,20 +9151,62 @@
 	(copy-file ftp filename)
 	(message "Wrote %s" filename)))))
 
-(eval-and-compile
-  (unless (fboundp 'w3m-add-local-hook)
-    ;; Silence the byte compiler; `w3m-add-local-hook' will be defined
-    ;; in another place for Emacs in which `make-local-hook' is obsolete.
-    (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.
-Note: this function is designed for Emacsen other than Emacs 21 and
-later."
-      (make-local-hook hook)
-      (add-hook hook function append t))))
+(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)))))
 
 (defun w3m-store-current-position ()
   "Memorize the current positions whenever every command starts.
@@ -7186,15 +9214,19 @@
 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 (line-beginning-position))
-				   (copy-marker (line-end-position)))))
+				   (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))
-    (run-hooks 'w3m-after-cursor-move-hook)))
+    ;; 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.
@@ -7204,17 +9236,19 @@
     (let ((buffer (w3m-alive-p t)))
       (if buffer
 	  (set-buffer buffer)
-	(set-buffer (generate-new-buffer "*w3m*"))
+	(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-static-when (or (featurep 'xemacs)
-		       (> emacs-major-version 20))
-    (w3m-initialize-graphic-icons))
+  (w3m-make-local-hook 'pre-command-hook)
+  (w3m-make-local-hook 'post-command-hook)
+  (add-hook 'pre-command-hook 'w3m-store-current-position nil t)
+  (add-hook 'post-command-hook 'w3m-check-current-position nil t)
+  (w3m-initialize-graphic-icons)
   (setq mode-line-buffer-identification
-	`("%b "
+	`(,@(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
@@ -7234,7 +9268,9 @@
 	  (w3m-current-process
 	   "Loading..." ,(if (fboundp 'format-mode-line)
 			     '(:eval (w3m-modeline-title))
-			   'w3m-current-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)
@@ -7253,85 +9289,94 @@
 
 (eval-when-compile
   (unless (fboundp 'format-mode-line)
-    (defalias 'format-mode-line 'ignore))
-  (unless (fboundp 'w3m-force-window-update)
-    (defalias 'w3m-force-window-update 'ignore)))
+    (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."
-  (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)
-			     (when (eq (selected-window)
-				       (get-buffer-window buffer))
-			       (w3m-force-window-update)))))
-		       (current-buffer))))))
+  (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)))))))
 
 ;;;###autoload
 (defun w3m-goto-url (url &optional reload charset post-data referer handler
-			 element)
+			 element no-popup save-pos)
   "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
+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 and ELEMENT[1] are for the internal operations
-of emacs-w3m.
+The remaining HANDLER, ELEMENT[1], NO-POPUP, and SAVE-POS[2] 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'.
+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."
+Notes for the developers:
+\[1] 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.
+
+\[2] SAVE-POS leads this function to save the current emacs-w3m window
+configuration; i.e. to run `w3m-history-store-position'.
+`w3m-history-store-position' should be called in a w3m-mode buffer, so
+this will be convenient if a command that calls this function may be
+invoked in other than a w3m-mode buffer."
   (interactive
-   (list
-    (w3m-input-url nil
-		   (or (w3m-active-region-or-url-at-point)
-		       (when (stringp w3m-current-url)
-			 (if (string-match "\\`about://\\(header\\|source\\)/"
-					   w3m-current-url)
-			     (substring w3m-current-url (match-end 0))
-			   w3m-current-url))))
-    current-prefix-arg
-    (w3m-static-if (fboundp 'universal-coding-system-argument)
-	coding-system-for-read)))
+   (list (if 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-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 (w3m-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))
-    (setq url (w3m-url-transfer-encode-string url w3m-default-coding-system)))
+    (w3m-string-match-url-components url)
+    (setq url (concat (save-match-data
+			(w3m-url-transfer-encode-string
+			 (substring url 0 (match-beginning 8))))
+		      (if (match-beginning 8)
+			  (concat "#" (match-string 9 url))
+			""))))
   (cond
    ;; process mailto: protocol
    ((string-match "\\`mailto:" url)
@@ -7362,10 +9407,27 @@
 				 (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.
-    (w3m-popup-buffer (current-buffer))
+    (unless no-popup
+      (w3m-popup-buffer (current-buffer)))
     (w3m-cancel-refresh-timer (current-buffer))
     (when w3m-current-process
       (error "%s"
@@ -7373,19 +9435,26 @@
 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.
-    ;; Store the current position in the history structure.
-    (w3m-history-store-position)
+    (w3m-idle-images-show-unqueue (current-buffer))
+    ;; Store the current position in the history structure if SAVE-POS
+    ;; is set or this command is called interactively.
+    (when (or save-pos (w3m-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)) "&"))))
+			    (split-string (substring url (match-end 0)) "&")))
+	      (w3m-async-exec (and w3m-async-exec-with-many-urls
+				   w3m-async-exec))
+	      buffers)
 	  (w3m-process-do
-	      (type (prog1
-			(w3m-goto-url (car urls))
-		      (dolist (url (cdr urls))
-			(save-excursion
-			  (set-buffer (w3m-copy-buffer nil nil nil 'empty))
-			  (save-window-excursion
+	      (type (save-window-excursion
+		      (prog1
+			  (w3m-goto-url (pop urls))
+			(dotimes (i (length urls))
+			  (push (w3m-copy-buffer nil nil nil 'empty) buffers))
+			(dolist (url (nreverse urls))
+			  (with-current-buffer (pop buffers)
 			    (w3m-goto-url url))))))
 	    type))
       ;; Retrieve the page.
@@ -7415,7 +9484,8 @@
 	  (when (setq w3m-current-forms
 		      (when (and (not reload) ; If reloading, ignore history.
 				 (null post-data) ; If post, ignore history.
-				 (w3m-cache-available-p url))
+				 (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.
@@ -7432,10 +9502,13 @@
 	    (setq url (replace-match "about://dtree/" nil nil url)
 		  orig url))
 	  ;; Split body and fragments.
-	  (and (string-match w3m-url-components-regexp url)
-	       (match-beginning 8)
+	  (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)
@@ -7445,6 +9518,15 @@
 		   (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))))
@@ -7456,10 +9538,17 @@
 				      (list :title (or w3m-current-title
 						       "<no-title>")))
 		    (goto-char (point-min)))
-		(if (and name (w3m-search-name-anchor name))
-		    (setf (w3m-arrived-time (w3m-url-strip-authinfo orig))
-			  (w3m-arrived-time url))
-		  (goto-char (point-min)))
+		(w3m-string-match-url-components w3m-current-url)
+		(and (match-beginning 8)
+		     (setq name (match-string 9 w3m-current-url)))
+		(when (and name
+			   (progn
+			     ;; Redisplay to search an anchor sure.
+			     (sit-for 0)
+			     (w3m-search-name-anchor
+			      name 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
@@ -7498,65 +9587,114 @@
 	      (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 (or (w3m-real-url url) url)))
+	      (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)
-  (let (file)
-    (file-name-as-directory
-     (if (and url (stringp url))
-	 (if (string-match "\\`ftp://" url)
-	     (progn
-	       (setq file (w3m-convert-ftp-url-for-emacsen url))
-	       (if (string-match "/\\`" file)
-		   file
-		 (file-name-directory file)))
-	   (setq file (w3m-url-to-file-name url))
-	   (if (and file (file-exists-p file))
-	       (if (file-directory-p file)
-		   file
-		 (file-name-directory file))
-	     w3m-profile-directory))
-       w3m-profile-directory))))
-
-;; Alias to meet `run-at-time' bug of XEmacs.  It runs the timer
-;; function almost immediately, so we use the emulated version
-;; instead.
-(eval-and-compile
-  (unless (fboundp 'w3m-run-at-time)
-    (defalias 'w3m-run-at-time 'run-at-time)))
+  "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
-	    (w3m-run-at-time (car w3m-current-refresh)
-			     nil
-			     'w3m-goto-url-with-timer
-			     (cdr w3m-current-refresh)
-			     (current-buffer))))))
+	    (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))
-    (if (get-buffer-window buffer)
-	(save-selected-window
-	  (pop-to-buffer buffer)
-	  (with-current-buffer buffer
-	    (w3m-cancel-refresh-timer buffer)
-	    (w3m-goto-url url (and w3m-current-url
-				   (string= url w3m-current-url)))))
+    (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)))))
+	(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
@@ -7566,18 +9704,12 @@
 will be created by copying the current session.  Otherwise, the new
 session will start afresh."
   (interactive
-   (list
-    (w3m-input-url nil
-		   (when (stringp w3m-current-url)
-		     (if (string-match "\\`about://\\(header\\|source\\)/"
-				       w3m-current-url)
-			 (substring w3m-current-url (match-end 0))
-		       w3m-current-url)))
-    current-prefix-arg
-    (w3m-static-if (fboundp 'universal-coding-system-argument)
-	coding-system-for-read)
-    nil ;; post-data
-    nil)) ;; referer
+   (list (w3m-input-url nil nil w3m-new-session-url 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))
@@ -7585,16 +9717,21 @@
 		   (w3m-popup-buffer buffer)
 		   t)))
 	(progn
-	  (switch-to-buffer (setq buffer
-				  (w3m-copy-buffer nil nil nil 'empty)))
+	  ;; 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 (string-match w3m-url-components-regexp url)
-				 (match-beginning 8)
+			    (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.
@@ -7615,9 +9752,15 @@
   (interactive)
   (unless w3m-home-page
     (error "You have to specify the value of `w3m-home-page'"))
-  (w3m-goto-url w3m-home-page))
+  (w3m-goto-url w3m-home-page t nil nil nil nil nil nil t))
 
-(defun w3m-reload-this-page (&optional arg)
+;;;###autoload
+(defun w3m-create-empty-session ()
+  "Create an empty page as a new session and visit it."
+  (interactive)
+  (w3m-goto-url-new-session "about:blank"))
+
+(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")
@@ -7633,12 +9776,29 @@
 	  (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)))
+		      (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."
@@ -7647,10 +9807,13 @@
       (w3m-message "Can't redisplay this page")
     (when arg
       (setq w3m-display-inline-images (not w3m-display-inline-images)))
-    (let ((w3m-history-reuse-history-elements
+    (let ((w3m-prefer-cache t)
+	  (w3m-history-reuse-history-elements
 	   ;; Don't move the history position.
 	   'reload))
-      (w3m-goto-url w3m-current-url 'redisplay))))
+      (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.
@@ -7662,7 +9825,11 @@
   (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 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)
@@ -7673,7 +9840,10 @@
   (interactive "P")
   (if (null w3m-current-url)
       (w3m-message "Can't execute the command")
-    (setf (w3m-arrived-content-charset w3m-current-url)
+    (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)))
@@ -7705,38 +9875,50 @@
 defaults to the value of `w3m-home-page' or \"about:\"."
   (let ((url (car command-line-args-left))
 	(directives '("-f" "-funcall" "--funcall" "-e"))
-	args directive num)
-    (if (and url
-	     (not (string-match "\\`-" url)))
-	(when (and
-	       (setq args (w3m-static-if (featurep 'xemacs)
-			      ;; Elements of `command-line-args' and
-			      ;; `command-line-args-left' aren't the
-			      ;; identical objects under XEmacs.
-			      (member url command-line-args)
-			    (memq url command-line-args)))
-	       (>= (setq num (- (length command-line-args) (length args) 1))
-		   2)
-	       (equal (nth num command-line-args) "w3m")
-	       (member (setq directive (nth (1- num) command-line-args))
-		       directives))
+	args)
+    (if (and url (not (string-match "\\`-" url)))
+	(progn
 	  (setq command-line-args-left (cdr command-line-args-left))
-	  (setcdr (nthcdr (- num 2) command-line-args)
-		  (cons (concat directive " w3m " url)
-			(nthcdr (+ num 2) command-line-args)))
-	  url)
-      (when (and
-	     (setq args (member "w3m" command-line-args))
-	     (member
-	      (setq directive
-		    (nth (setq num
-			       (- (length command-line-args) (length args) 1))
+	  (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))
-	      directives))
-	(setcdr (nthcdr (1- num) command-line-args)
-		(cons (concat directive " w3m")
-		      (nthcdr (+ num 2) command-line-args)))
-	(or w3m-home-page "about:")))))
+      (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)
@@ -7792,7 +9974,8 @@
 	  (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)))))
+			(w3m-input-url nil nil default w3m-quick-start
+				       'feeling-lucky)))))
       ;; new-session
       (and w3m-make-new-session
 	   (w3m-alive-p)
@@ -7800,6 +9983,7 @@
       ;; 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)))
@@ -7816,13 +10000,20 @@
     (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 (generate-new-buffer "*w3m*"))
+      (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
-	  (w3m-goto-url url)
+	  (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)))))
 
@@ -7843,7 +10034,7 @@
     (setq url (w3m-canonicalize-url url))
     (if new-session
 	(w3m-goto-url-new-session url)
-      (w3m-goto-url url))))
+      (w3m-goto-url url nil nil nil nil nil nil nil t))))
 
 ;;;###autoload
 (defun w3m-find-file (file)
@@ -7853,7 +10044,8 @@
   (w3m-goto-url (w3m-expand-file-name-as-url file)
 		nil
 		(w3m-static-if (fboundp 'universal-coding-system-argument)
-		    coding-system-for-read)))
+		    coding-system-for-read)
+		nil nil nil nil nil t))
 
 (defun w3m-cygwin-path (path)
   "Convert PATH in the win32 style into the cygwin format.
@@ -7881,7 +10073,9 @@
     (let ((w3m-current-buffer (current-buffer)))
       (unless charset
 	(setq charset (w3m-correct-charset (w3m-detect-meta-charset))))
-      (setq w3m-current-url url
+      (setq url (or url
+		    w3m-buffer-local-url)
+	    w3m-current-url url
 	    w3m-current-base-url url
 	    w3m-current-coding-system
 	    (if charset
@@ -7895,6 +10089,13 @@
 	(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)
@@ -7914,39 +10115,39 @@
 </html>")
   "text/html")
 
-(defun w3m-view-source ()
-  "Display the html source of the current buffer."
-  (interactive)
+(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))
+      (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))))
-	  (setq truncate-lines nil))
+				(substring w3m-current-url (match-end 0)))))
 	 (t
-	  (w3m-goto-url  (concat "about://source/" w3m-current-url))
-	  (setq truncate-lines nil))))
+	  (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")
-      (w3m-static-if (boundp 'MULE)
-	  ;; `make-string' doesn't support Japanese chars
-	  ;; and the 1st arg to `make-char' should be int.
-	  (let ((default-mc-flag t))
-	    (with-temp-buffer
-	      (insert-char (make-char (symbol-value 'lc-jp)
-				      40 44)
-			   (/ (w3m-display-width) 2))
-	      (buffer-string)))
-	(make-string (/ (w3m-display-width) 2)
-		     (make-char 'japanese-jisx0208 40 44)))
+      (make-string (/ (w3m-display-width) 2)
+		   (make-char 'japanese-jisx0208 40 44))
     (make-string (w3m-display-width) ?-)))
 
-(defun w3m-about-header (url &optional no-decode no-cache &rest args)
+(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"
@@ -7957,19 +10158,36 @@
 	    "\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)
-		"")))
+	      (if time (current-time-string time) "")))
+
+    (let (anchor anchor-title
+          image-url image-alt image-size)
+      (with-current-buffer w3m-current-buffer
+	(when (equal url w3m-current-url)
+          (setq anchor (w3m-anchor)
+                anchor-title (w3m-anchor-title)
+                image-url (w3m-image)
+                image-alt (w3m-image-alt)
+                image-size (w3m-get-text-property-around 'w3m-image-size))))
+      (if anchor
+	  (insert "\nCurrent Anchor: " anchor))
+      (if anchor-title
+	  (insert "\nAnchor Title:   " anchor-title))
+      (if image-url
+          (insert "\nImage:      " image-url))
+      (if image-alt
+          (insert "\nImage Alt:  " image-alt))
+      (if image-size
+          (insert (format "\nImage Size: %sx%s"
+                          (car image-size) (cdr image-size)))))
+
     (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\nModifer Information\n")
+	(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))
@@ -7977,7 +10195,7 @@
 				  (or (unless no-cache
 					(w3m-cache-request-header url))
 				      (w3m-process-with-wait-handler
-					(w3m-w3m-dump-head url 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))
@@ -8005,19 +10223,25 @@
   "Display the header of the current page."
   (interactive)
   (if w3m-current-url
-      (let ((w3m-prefer-cache t))
-	(cond
-	 ((string-match "\\`about://header/" w3m-current-url)
-	  (w3m-goto-url (substring w3m-current-url (match-end 0))))
-	 ((string-match "\\`about://source/" w3m-current-url)
-	  (w3m-goto-url (concat "about://header/"
-				(substring w3m-current-url (match-end 0))))
-	  (setq truncate-lines nil))
-	 ((string-match "\\`about:" w3m-current-url)
-	  (error "Can't load a header for %s" w3m-current-url))
-	 (t
-	  (w3m-goto-url (concat "about://header/" w3m-current-url))
-	  (setq truncate-lines nil))))
+      (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)
@@ -8122,8 +10346,8 @@
 	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 2) 'size 'start)
+	(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
@@ -8216,7 +10440,11 @@
       (w3m-next-anchor)
       (while (progn
 	       (setq start (point))
-	       (re-search-forward " (\\([0-9]+ \\)*[0-9]+)$" nil t))
+	       ;; Extend href anchor.
+	       (put-text-property (point-at-bol) start
+				  'w3m-href-anchor
+				  (get-text-property start 'w3m-href-anchor))
+	       (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))
@@ -8230,7 +10458,7 @@
 	(w3m-next-anchor)
 	(setq start (point))
 	(end-of-line)
-	(put-text-property start (point) 'face 'w3m-history-current-url-face)
+	(w3m-add-face-property start (point) 'w3m-history-current-url)
 	(goto-char start)))
     (set-buffer-modified-p nil)))
 
@@ -8247,14 +10475,15 @@
    (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) ""))))
+		 (if size (format "&size=%d" size) ""))
+		 nil nil nil nil nil nil nil t))
 
 (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-goto-url "about://history/" nil nil nil nil nil nil nil t)
     (w3m-db-history nil w3m-db-history-display-size)))
 
 (defun w3m-w32-browser-with-fiber (url)
@@ -8267,6 +10496,51 @@
     (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."
@@ -8310,17 +10584,12 @@
 	  (not w3m-select-buffer-horizontal-window))
     (when (get-buffer-window w3m-select-buffer-name)
       (delete-windows-on w3m-select-buffer-name)))
-  (cond ((eq major-mode 'w3m-mode)
-	 (w3m-delete-frames-and-windows (selected-window))
-	 (unless (get-buffer-window w3m-select-buffer-name)
-	   (delete-other-windows)))
-	((eq major-mode 'w3m-select-buffer-mode))
-	(t
-	 (let ((buffer (w3m-alive-p t)))
-	   (if buffer
-	       (w3m-popup-buffer buffer)
-	     (w3m-goto-url (or w3m-home-page "about:"))))
-	 (delete-other-windows)))
+  (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))
@@ -8336,22 +10605,24 @@
   (w3m-select-buffer-mode)
   (or nomsg (w3m-message w3m-select-buffer-message)))
 
-(unless (fboundp 'w3m-update-tab-line)
-  (defalias 'w3m-update-tab-line 'ignore))
-
 (defun w3m-select-buffer-update (&rest args)
   (when (get-buffer-window w3m-select-buffer-name)
     (save-selected-window
       (w3m-select-buffer nil 'update)))
-  (w3m-update-tab-line))
+  (when w3m-use-tab
+    (w3m-force-window-update)))
 
 (defun w3m-select-buffer-generate-contents (current-buffer)
-  (let (buffer-read-only)
+  (let ((i 0)
+	(inhibit-read-only t))
     (delete-region (point-min) (point-max))
     (dolist (buffer (w3m-list-buffers))
       (put-text-property (point)
 			 (progn
-			   (insert (w3m-buffer-title buffer) "\n")
+			   (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")
@@ -8401,6 +10672,7 @@
     (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)))
 
@@ -8441,19 +10713,19 @@
 	truncate-lines t
 	buffer-read-only t)
   (use-local-map w3m-select-buffer-mode-map)
-  (run-hooks 'w3m-select-buffer-mode-hook))
+  (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 ((buffer-read-only nil))
+  (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 (line-beginning-position) 'w3m-select-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."
@@ -8481,9 +10753,7 @@
       (save-selected-window
 	(pop-to-buffer buffer)
 	(w3m-scroll-up-or-next-url nil)))
-    ;; FIXME: we should use a hook variable for this, maybe.
-    (w3m-static-when (boundp 'header-line-format)
-      (w3m-force-window-update w3m-select-buffer-window))
+    (w3m-force-window-update w3m-select-buffer-window)
     (w3m-message w3m-select-buffer-message)
     buffer))
 
@@ -8538,6 +10808,7 @@
     (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))
@@ -8569,7 +10840,7 @@
   "Show the buffer on the menu and switch to the buffer."
   (interactive)
   (pop-to-buffer (w3m-select-buffer-show-this-line))
-  (w3m-message ""))
+  (message nil))
 
 (defun w3m-select-buffer-show-this-line-and-quit ()
   "Show the buffer on the menu and quit the buffers selection."
@@ -8605,35 +10876,46 @@
   :group 'w3m
   :type 'boolean)
 
-(defface w3m-header-line-location-title-face
+(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-face
+(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 Emacs 21 and later.
+    ;; 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)
-		 (< emacs-major-version 21)
 		 (w3m-use-tab-p))
 	     w3m-use-header-line
 	     w3m-current-url
@@ -8645,20 +10927,18 @@
 					   (ct " [T]")
 					   (charset " [C]")
 					   (t "")))))
-    (w3m-add-text-properties (point-min) (point)
-			     `(face w3m-header-line-location-title-face))
+    (w3m-add-face-property (point-min) (point) 'w3m-header-line-location-title)
     (let ((start (point)))
-      (insert w3m-current-url)
+      (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
+					"%\\([2-9a-f][0-9a-f]\\)"))))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
       (w3m-add-text-properties start (point)
-			       `(face
-				 w3m-header-line-location-content-face
-				 mouse-face
-				 highlight
-				 ,(if (or (featurep 'xemacs)
-					  (>= emacs-major-version 21))
-				      'keymap
-				    'local-map)
-				 ,w3m-header-line-map
+			       `(mouse-face highlight
+				 keymap ,w3m-header-line-map
 				 ,@(if (featurep 'xemacs)
 				       '(help-echo
 					 "button2 prompts to input URL"
@@ -8674,90 +10954,90 @@
 			       (frame-width)
 			     (window-width))
 			   (current-column) 1)))
-      (w3m-add-text-properties start (point)
-			       '(face w3m-header-line-location-content-face))
+      (w3m-add-face-property start (point) 'w3m-header-line-location-content)
       (unless (eolp)
 	(insert "\n")))))
 
-
 ;;; w3m-minor-mode
-(defvar w3m-goto-article-function nil
-  "Function to visit an article pointed by a given URL.
-A function set to this variable must accept an URL, and must return
-non-nil when an article pointed by the URL is found.")
+(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 ()
+(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' without three
-differences: (1) this command accepts no arguments, (2) this command
-does not handle forms, and (3) this command does not consider URL-like
-strings under the cursor.  When a unsecure page which may contain
-vicious forms is viewed, this command should be used instead of
-`w3m-view-this-url'.
-
-Note that this command depends on the value of `w3m-safe-url-regexp'
-\(which see) to consider whether the URL is safe.  You need to keep in
-mind that there may be pages which cause security problems.
+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)
+  (interactive "P")
   (let ((w3m-pop-up-windows nil)
-	(url (w3m-url-valid (w3m-anchor))))
+	(url (w3m-url-valid (w3m-anchor)))
+	safe-regexp)
     (cond
-     (url (or (when (fboundp w3m-goto-article-function)
-		(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))))
+     (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 (w3m-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)
-	  (w3m-toggle-inline-image)
+	  (if (w3m-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)
-  (w3m-safe-view-this-url))
-
-(defun w3m-safe-toggle-inline-image (&optional force no-cache)
-  "Toggle the visibility of an image under point.
-This function is mostly equivalent to `w3m-toggle-inline-image', but
-the value of `w3m-safe-url-regexp' is bound to \"\\\\`cid:\" while
-displaying an image.  You can invalidate it (treat as nil) by
-specifying the prefix argument if you don't mind it may cause a
-security problem."
-  (interactive "P")
-  (let ((w3m-safe-url-regexp (unless (and force
-					  (yes-or-no-p "\
-Are you sure you really want to show this image (maybe unsecure)? "))
-			       "\\`cid:")))
-    (w3m-toggle-inline-image force no-cache)))
-
-(defun w3m-safe-toggle-inline-images (&optional force no-cache)
-  "Toggle the visibility of all images in the buffer.
-This function is mostly equivalent to `w3m-toggle-inline-images', but
-the value of `w3m-safe-url-regexp' is bound to \"\\\\`cid:\" while
-displaying images.  You can invalidate it (treat as nil) by specifying
-the prefix argument if you don't mind it may cause a security problem."
-  (interactive "P")
-  (let ((w3m-safe-url-regexp (unless (and force
-					  (yes-or-no-p "\
-Are you sure you really want to show all images (maybe unsecure)? "))
-			       "\\`cid:")))
-    (w3m-toggle-inline-images force no-cache)))
+  (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-safe-toggle-inline-image)
-    (w3m-toggle-inline-images . w3m-safe-toggle-inline-images)
+    (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))
@@ -8805,14 +11085,33 @@
 		(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))))))
+
+(defun w3m-show-form-hint ()
+  "Show sending form hint when the cursor is in a form."
+  (let ((keys (where-is-internal 'w3m-submit-form)))
+    (when (and (w3m-submit (point)) keys)
+      (w3m-message "Press %s to send the current form."
+		   (key-description (car keys))))))
 
 (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))
+  (when w3m-init-file
+    (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
diff -ur --exclude=work --exclude='*texinfo*' --exclude=CVS --exclude='ChangeLog*' --exclude='README*' --exclude='*texi' work/emacs-w3m-1.4.4/w3mhack.el /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3mhack.el
--- work/emacs-w3m-1.4.4/w3mhack.el	2013-06-14 14:07:24.000000000 +0900
+++ /export/CHROOT/usr/pkgsrc/wip/emacs-w3m-current/work/emacs-w3m/w3mhack.el	2012-07-18 15:04:56.000000000 +0900
@@ -1,6 +1,6 @@
 ;;; w3mhack.el --- a hack to setup the environment for building w3m
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001-2010, 2012
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
@@ -20,8 +20,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 
 ;;; Commentary:
@@ -54,6 +54,10 @@
 
 ;;; Code:
 
+(when (featurep 'xemacs)
+  (setq log-warning-minimum-level 'info)
+  (setenv "XEMACSDEBUG" nil))
+
 (defvar w3mhack-nonunix-lispdir nil
   "*Directory to where emacs-w3m lisp programs are installed.
 nil means that all programs are installed to the default directory.")
@@ -72,8 +76,7 @@
 (let ((test (lambda (shell)
 	      (let ((buffer (generate-new-buffer " *temp*"))
 		    (msg "Hello World"))
-		(save-excursion
-		  (set-buffer buffer)
+		(with-current-buffer buffer
 		  (condition-case nil
 		      (call-process shell nil t nil "-c"
 				    (concat "MESSAGE=\"" msg "\"&&"
@@ -104,7 +107,7 @@
 				      (member "-funcall" command-line-args)
 				      (member "--funcall" command-line-args)
 				      (member "-e" command-line-args)))
-			   '("w3mhack-batch-compile" "w3mhack-compile"
+			   '("batch-byte-compile" "w3mhack-compile"
 			     "w3mhack-makeinfo" "w3mhack-make-package")))
 	      (error "%s" "\n\
 There seems to be no shell command which is equivalent to /bin/sh.
@@ -149,7 +152,7 @@
 
 (when (and (not (featurep 'xemacs))
 	   (= emacs-major-version 21)
-	   (= emacs-minor-version 3)
+	   (>= emacs-minor-version 3)
 	   (condition-case code
 	       (let ((byte-compile-error-on-warn t))
 		 (byte-optimize-form (quote (pop x)) t)
@@ -184,54 +187,6 @@
 	      (put 'car 'side-effect-free tmp)))
 	ad-do-it))))
 
-(when (<= emacs-major-version 19)
-  ;; Make `locate-library' run quietly.
-  (let (current-load-list)
-    ;; Mainly for the compile-time.
-    (defun locate-library (library &optional nosuffix)
-      "Show the full path name of Emacs library LIBRARY.
-This command searches the directories in `load-path' like `M-x load-library'
-to find the file that `M-x load-library RET LIBRARY RET' would load.
-Optional second arg NOSUFFIX non-nil means don't add suffixes `.elc' or `.el'
-to the specified name LIBRARY (a la calling `load' instead of `load-library')."
-      (interactive "sLocate library: ")
-      (catch 'answer
-	(mapcar
-	 '(lambda (dir)
-	    (mapcar
-	     '(lambda (suf)
-		(let ((try (expand-file-name (concat library suf) dir)))
-		  (and (file-readable-p try)
-		       (null (file-directory-p try))
-		       (progn
-			 (or noninteractive
-			     (message "Library is file %s" try))
-			 (throw 'answer try)))))
-	     (if nosuffix '("") '(".elc" ".el" ""))))
-	 load-path)
-	(or noninteractive
-	    (message "No library %s in search path" library))
-	nil))
-    (byte-compile 'locate-library)))
-
-;; Fix an XEmacs 21.5 bug in `call-process-region'.  It has been reported
-;; as <URL:http://news.gmane.org/group/gmane.emacs.xemacs.beta/thread=16564>.
-(when (and (featurep 'xemacs)
-	   (executable-find "cat")
-	   (with-temp-buffer
-	     (insert "bar")
-	     (backward-char)
-	     (call-process-region (1- (point)) (point) "cat" t t)
-	     (goto-char (point-min))
-	     (not (looking-at "bar"))))
-  (defadvice call-process-region (around fix-xemacs-bug activate)
-    "Narrow to the specified region while running the original function.
-It fixes an XEmacs 21.5 bug."
-    (save-restriction
-      (narrow-to-region (ad-get-arg 0) (ad-get-arg 1))
-      (goto-char (point-max))
-      ad-do-it)))
-
 ;; Add `configure-package-path' to `load-path' for XEmacs.  Those paths
 ;; won't appear in `load-path' when XEmacs starts with the `-vanilla'
 ;; option or the `-no-autoloads' option because of a bug. :<
@@ -262,25 +217,23 @@
 
 ;; Add supplementary directories to `load-path'.
 (let ((addpath (or (pop command-line-args-left) "NONE"))
+      (index 0)
       path paths)
-  (while (string-match "\\([^\0-\37:]+\\)[\0-\37:]*" addpath)
+  (while (string-match "\\([^\0-\37:]+\\)[\0-\37:]*" addpath index)
     (setq path (file-name-as-directory
-		(expand-file-name (substring addpath
-					     (match-beginning 1)
-					     (match-end 1))))
-	  addpath (substring addpath (match-end 0)))
+		(expand-file-name (match-string 1 addpath)))
+	  index (match-end 0))
     (when (file-directory-p path)
       (push path paths)))
   (unless (null paths)
     (setq load-path (nconc (nreverse paths) load-path))))
 
 ;; Check for the required modules.
-(when (or (featurep 'xemacs)
-	  (<= emacs-major-version 19))
+(when (featurep 'xemacs)
   (let ((apel (locate-library "path-util"))
 	(emu (locate-library "pccl")))
     (if (and apel emu)
-	(when (featurep 'xemacs)
+	(progn
 	  (setq apel (file-name-directory apel)
 		emu (file-name-directory emu))
 	  (if (not (string-equal apel emu))
@@ -312,7 +265,7 @@
 		   apel
 		   "\n
  If you are using the official APEL XEmacs package (or possibly SUMO),
- look for the new one (version 1.23 and later) and install it in your
+ look for the new one (version 1.32 and later) and install it in your
  system, or send a bug report to the maintainers using
  `M-x report-xemacs-bug'.  Otherwise, you may rebuild APEL from the
  source distribution, see manuals where you could get it from.")))
@@ -324,66 +277,47 @@
 
 (defconst shimbun-module-directory "shimbun")
 
-(defconst w3mhack-colon-keywords-file "w3m-kwds.el")
-
 (defvar w3mhack-load-file "w3m-load.el")
 
 ;; Needed for interdependencies among w3m and shimbun modules.
 (push default-directory load-path)
 (push (expand-file-name shimbun-module-directory default-directory) load-path)
 
-(defun w3mhack-mdelete (elts list)
-  "Like `delete', except that it also works for a list of subtractions."
-  (if elts
-      (if (consp elts)
-	  (let ((rest (delete (car elts) list)))
-	    (while (setq elts (cdr elts))
-	      (setq rest (delete (car elts) rest))
-	      (delete (car elts) list))
-	    rest)
-	(delete elts list))
-    list))
-
 (defun w3mhack-module-list ()
   "Returna a list of w3m modules should be byte-compile'd."
   (let* ((modules (directory-files default-directory nil "^[^#]+\\.el$"))
-	 (version-specific-modules '("w3m-e19.el" "w3m-e20.el" "w3m-e21.el"
-				     "w3m-e23.el"
-				     "w3m-fsf.el" "w3m-om.el" "w3m-xmas.el"))
+	 (version-specific-modules '("w3m-ems.el" "w3m-xmas.el"))
 	 (ignores;; modules not to be byte-compiled.
 	  (append
-	   (list "w3mhack.el" "w3m-setup.el"
-		 w3mhack-load-file w3mhack-colon-keywords-file)
-	   (w3mhack-mdelete (cond ((featurep 'xemacs)
-				   "w3m-xmas.el")
-				  ((boundp 'MULE)
-				   "w3m-om.el")
-				  ((>= emacs-major-version 23)
-				   '("w3m-e23.el" "w3m-fsf.el"))
-				  ((>= emacs-major-version 21)
-				   '("w3m-e21.el" "w3m-fsf.el"))
-				  ((= emacs-major-version 20)
-				   '("w3m-e20.el" "w3m-fsf.el"))
-				  (t
-				   "w3m-e19.el"))
-			    (copy-sequence version-specific-modules))))
+	   (list "w3mhack.el" "w3m-setup.el" w3mhack-load-file)
+	   (delete (if (featurep 'xemacs) "w3m-xmas.el" "w3m-ems.el")
+		   (copy-sequence version-specific-modules))))
 	 (shimbun-dir (file-name-as-directory shimbun-module-directory))
 	 print-level print-length)
-    (unless (locate-library "mew")
+    ;; Exclude very old Mew XEmacs package.
+    (unless
+	(if (featurep 'xemacs)
+	    (let ((el (locate-library "mew"))
+		  pkg)
+	      (and el
+		   (if (file-exists-p (setq pkg (expand-file-name
+						 "_pkg.el"
+						 (file-name-directory el))))
+		       (condition-case nil
+			   (let ((packages-package-list packages-package-list))
+			     (load pkg nil t)
+			     (>= (string-to-number (package-get-key
+						    'mew :author-version))
+				 2))
+			 (error nil))
+		     t)))
+	  (locate-library "mew"))
       (push "mew-w3m.el" ignores))
     (unless (if (featurep 'xemacs)
 		(and (featurep 'mule) (locate-library "pccl"))
 	      (locate-library "ccl"))
       (push "w3m-ccl.el" ignores))
     (unless (and (featurep 'mule)
-		 (if (featurep 'xemacs)
-		     ;; Mule-UCS does not support XEmacs versions prior
-		     ;; to 21.2.37.
-		     (and (>= emacs-major-version 21)
-			  (or (> emacs-minor-version 2)
-			      (and (= emacs-major-version 2)
-				   (>= emacs-beta-version 37))))
-		   (>= emacs-major-version 20))
 		 (locate-library "un-define"))
       (push "w3m-ucs.el" ignores))
     (if (and (featurep 'mule)
@@ -394,10 +328,8 @@
 					 nil "^[^#]+\\.el$"))
 	    (setq modules (nconc modules (list (concat shimbun-dir file)))))
 	  ;; mew-shimbun check
-	  (unless
-	      ;; Mew 2.x and later do not support Mule2.3/Emacs19.
-	      (and (>= emacs-major-version 20)
-		   (locate-library "mew-nntp"))
+	  (when (or (member "mew-w3m.el" ignores)
+		    (not (locate-library "mew-nntp")))
 	    (push (concat shimbun-dir "mew-shimbun.el") ignores))
 	  ;; nnshimbun check
 	  (unless (let ((gnus (locate-library "gnus")))
@@ -410,20 +342,10 @@
     (unless (featurep 'mule)
       (push "w3m-weather.el" ignores)
       (push "w3m-symbol.el" ignores))
-    (if (and (not (featurep 'xemacs))
-	     (<= emacs-major-version 20)
-	     (locate-library "bitmap"))
-	;; Against the error "Already defined charset: 242".
-	(when (locate-library "un-define")
-	  (require 'un-define)
-	  (setq bitmap-alterable-charset 'tibetan-1-column)
-	  (require 'bitmap))
-      (push "w3m-bitmap.el" ignores))
-    (unless (>= emacs-major-version 21)
-      (push "w3m-favicon.el" ignores))
+    (when (or (featurep 'xemacs)
+	      (< emacs-major-version 23))
+      (push "bookmark-w3m.el" ignores))
     ;; List shimbun modules which cannot be byte-compiled with this system.
-    (unless (locate-library "xml")
-      (setq ignores (nconc ignores (w3mhack-shimbun-modules-using-rss))))
     (let (list)
       ;; To byte-compile w3m-util.el and a version specific module first.
       (push "w3m-util.el" list)
@@ -445,41 +367,8 @@
   (dolist (module (w3mhack-module-list))
     (princ (format "%sc " module))))
 
-(defun w3mhack-shimbun-modules-using-rss ()
-  "Return a list of shimbun modules using RSS."
-  (let* ((dir (file-name-as-directory shimbun-module-directory))
-	 ;; sb-rss.el exactly needs xml.el.
-	 (files (delete "sb-rss.el" (directory-files dir nil "\\.el\\'")))
-	 (rest (list (concat dir "sb-rss.el")))
-	 (buffer (generate-new-buffer " *temp*"))
-	 file form)
-    (save-excursion
-      (set-buffer buffer)
-      (while files
-	(setq file (concat dir (car files))
-	      files (cdr files))
-	(insert-file-contents file)
-	(goto-char (point-min))
-	(while (and file
-		    (setq form (condition-case nil
-				   (read (current-buffer))
-				 (error nil))))
-	  (when (equal form '(require (quote sb-rss)))
-	    (push file rest)
-	    (setq file nil)))
-	(erase-buffer)))
-    (kill-buffer buffer)
-    rest))
-
-(when (or (<= emacs-major-version 19)
-	  (and (= emacs-major-version 20)
-	       (<= emacs-minor-version 2)))
-  ;; Not to get the byte-code for `current-column' inlined.
-  (put 'current-column 'byte-compile nil))
-
 (defun w3mhack-compile ()
   "Byte-compile the w3m modules."
-  (w3mhack-check-colon-keywords-file)
   (w3mhack-generate-load-file)
   (let (modules)
     (dolist (el (w3mhack-module-list))
@@ -497,11 +386,6 @@
 	(error))
       (setq modules (cdr modules)))))
 
-(defun w3mhack-batch-compile ()
-  "Wrapper function of `batch-byte-compile'."
-  (w3mhack-check-colon-keywords-file)
-  (batch-byte-compile))
-
 (defun w3mhack-nonunix-install ()
   "Byte-compile the w3m modules and install them."
   (w3mhack-compile)
@@ -509,36 +393,34 @@
     (setq w3mhack-nonunix-lispdir
 	  (expand-file-name "../../site-lisp/w3m" data-directory)))
   (and (not w3mhack-nonunix-icondir)
-       (or (featurep 'xemacs)
-	   (> emacs-major-version 20))
        (setq w3mhack-nonunix-icondir
-	     (expand-file-name "w3m" data-directory)))
-  (labels
-      ((mkdir (dir)
-	      (unless (file-directory-p dir)
-		(message "mkdir %s" dir)
-		(unless w3mhack-nonunix-dryrun
-		  (make-directory dir 'parents))))
-       (install (srcdir dstdir pattern)
-		(dolist (src (directory-files srcdir t pattern))
-		  (let ((dst (expand-file-name
-			      (file-name-nondirectory src) dstdir)))
-		    (message "cp %s %s"
-			     (file-relative-name src default-directory) dst)
-		    (unless w3mhack-nonunix-dryrun
-		      (copy-file src dst t t))))))
-    (mkdir w3mhack-nonunix-lispdir)
-    (install default-directory w3mhack-nonunix-lispdir "\\.elc?\\'")
+	     (expand-file-name "images/w3m" data-directory)))
+  (let ((mkdir (lambda (dir)
+		 (unless (file-directory-p dir)
+		   (message "mkdir %s" dir)
+		   (unless w3mhack-nonunix-dryrun
+		     (make-directory dir 'parents)))))
+	(install (lambda (srcdir dstdir pattern)
+		   (dolist (src (directory-files srcdir t pattern))
+		     (let ((dst (expand-file-name
+				 (file-name-nondirectory src) dstdir)))
+		       (message "cp %s %s"
+				(file-relative-name src default-directory) dst)
+		       (unless w3mhack-nonunix-dryrun
+			 (copy-file src dst t t)))))))
+    (funcall mkdir w3mhack-nonunix-lispdir)
+    (funcall install default-directory w3mhack-nonunix-lispdir "\\.elc?\\'")
     (let ((shimbun-directory
 	   (expand-file-name shimbun-module-directory default-directory)))
       (when (file-exists-p (expand-file-name "shimbun.elc" shimbun-directory))
-	(install shimbun-directory w3mhack-nonunix-lispdir "\\.elc?\\'")))
+	(funcall install shimbun-directory w3mhack-nonunix-lispdir
+		 "\\.elc?\\'")))
     (when w3mhack-nonunix-icondir
-      (mkdir w3mhack-nonunix-icondir)
-      (install (expand-file-name (if (featurep 'xemacs)
-				     "icons30"
-				   "icons"))
-	       w3mhack-nonunix-icondir "\\.xpm\\'"))))
+      (funcall mkdir w3mhack-nonunix-icondir)
+      (funcall install (expand-file-name (if (featurep 'xemacs)
+					     "icons30"
+					   "icons"))
+	       w3mhack-nonunix-icondir "\\.\\(?:png\\|xpm\\)\\'"))))
 
 ;; Byte optimizers and version specific functions.
 (condition-case nil
@@ -563,13 +445,13 @@
 	(lambda (form)
 	  (if (cdr form)
 	      (let ((pos (car (cdr form))))
-		(` (let ((cur (point)))
-		     (prog2
-			 (goto-char (, pos))
-			 (if (bobp)
-			     nil
-			   (preceding-char))
-		       (goto-char cur)))))
+		`(let ((cur (point)))
+		   (prog2
+		       (goto-char ,pos)
+		       (if (bobp)
+			   nil
+			 (preceding-char))
+		     (goto-char cur))))
 	    '(if (bobp)
 		 nil
 	       (preceding-char)))))))
@@ -579,28 +461,28 @@
        (let ((num (nth 1 form))
 	     (string (nth 2 form)))
 	 (cond ((and string (featurep 'xemacs))
-		(` (let ((num (, num)))
-		     (if (match-beginning num)
-			 (let ((string (substring (, string)
-						  (match-beginning num)
-						  (match-end num))))
-			   (map-extents (lambda (extent maparg)
-					  (delete-extent extent))
-					string 0 (length string))
-			   string)))))
+		`(let ((num ,num))
+		   (if (match-beginning num)
+		       (let ((string (substring ,string
+						(match-beginning num)
+						(match-end num))))
+			 (map-extents (lambda (extent maparg)
+					(delete-extent extent))
+				      string 0 (length string))
+			 string))))
 	       (string
-		(` (let ((num (, num)))
-		     (if (match-beginning num)
-			 (let ((string (substring (, string)
-						  (match-beginning num)
-						  (match-end num))))
-			   (set-text-properties 0 (length string) nil string)
-			   string)))))
+		`(let ((num ,num))
+		   (if (match-beginning num)
+		       (let ((string (substring ,string
+						(match-beginning num)
+						(match-end num))))
+			 (set-text-properties 0 (length string) nil string)
+			 string))))
 	       (t
-		(` (let ((num (, num)))
-		     (if (match-beginning num)
-			 (buffer-substring-no-properties
-			  (match-beginning num) (match-end num))))))))))
+		`(let ((num ,num))
+		   (if (match-beginning num)
+		       (buffer-substring-no-properties
+			(match-beginning num) (match-end num)))))))))
 
 (cond
  ((featurep 'xemacs)
@@ -609,33 +491,31 @@
 	(delq 'unused-vars (copy-sequence byte-compile-default-warnings)))
 
   (defun w3mhack-byte-optimize-letX (form)
-    "Byte optimize `let' or `let*' FORM in the source level
-to remove some obsolete variables in the first argument VARLIST.
-
-Examples of the optimization:
-
-;;From
-  (let ((coding-system-for-read 'binary)
-	(file-coding-system-for-read *noconv*))
-    (insert-file-contents FILE))
-;;To
-  (let ((coding-system-for-read 'binary))
-    (insert-file-contents FILE))
-
-;;From
-  (let* ((codesys 'utf-8)
-	 (file-coding-system codesys)
-	 (coding-system-for-write file-coding-system))
-    (save-buffer))
-;;To
-  (let* ((codesys 'utf-8)
-	 (coding-system-for-write codesys))
-    (save-buffer))
+    "Do the source level optimization for the `let' and `let*' forms.
+This function removes some obsolete variables in the 1st arg VARLIST.
+Here are examples showing how of it works.
+
+  (let ((pop-up-frames t)
+	(pop-up-frame-alist PARAMETERS)
+	(pop-up-frame-plist PARAMETERS))
+    (pop-to-buffer BUFFER))
+	|
+	V
+  (let ((pop-up-frames t)
+	(pop-up-frame-plist PARAMETERS))
+    (pop-to-buffer BUFFER))
+
+  (let* ((pop-up-frames t)
+	 (pop-up-frame-alist PARAMETERS)
+	 (pop-up-frame-plist pop-up-frame-alist))
+    (pop-to-buffer BUFFER))
+	|
+	V
+  (let* ((pop-up-frames t)
+	 (pop-up-frame-plist PARAMETERS))
+    (pop-to-buffer BUFFER))
 "
-    (let ((obsoletes '(file-coding-system
-		       file-coding-system-for-read
-		       pathname-coding-system
-		       pop-up-frame-alist))
+    (let ((obsoletes '(pop-up-frame-alist))
 	  (varlist (copy-sequence (cadr form)))
 	  obsolete elements element value)
       (while (setq obsolete (pop obsoletes))
@@ -680,14 +560,14 @@
 		    (eq 'length (car-safe end))
 		    (eq string (car-safe (cdr-safe end))))
 	       (if props
-		   (` (let ((end (, end)))
-			(map-extents (lambda (extent maparg)
-				       (delete-extent extent))
-				     (, string) 0 end)
-			(add-text-properties 0 end (, props) (, string))))
-		 (` (map-extents (lambda (extent maparg)
-				   (delete-extent extent))
-				 (, string) 0 (, end))))
+		   `(let ((end ,end))
+		      (map-extents (lambda (extent maparg)
+				     (delete-extent extent))
+				   ,string 0 end)
+		      (add-text-properties 0 end ,props ,string))
+		 `(map-extents (lambda (extent maparg)
+				 (delete-extent extent))
+			       ,string 0 ,end))
 	     form))))
 
   (defun w3mhack-make-package ()
@@ -709,11 +589,11 @@
 	   (elcs (with-temp-buffer
 		   (let ((standard-output (current-buffer)))
 		     (w3mhack-examine-modules)
-		     (split-string (buffer-string) " \\(shimbun/\\)?"))))
+		     (split-string (buffer-string) " \\(?:shimbun/\\)?"))))
 	   (icons (directory-files (expand-file-name "icons30/") nil
-				   "^[^#]+\\.xpm\\'"))
+				   "^[^#]+\\.\\(?:png\\|xpm\\)\\'"))
 	   (infos (directory-files (expand-file-name "doc/") nil
-				   "^[^#]+\\.info\\(-[0-9]+\\)?\\'"))
+				   "^[^#]+\\.info\\(?:-[0-9]+\\)?\\'"))
 	   (si:message (symbol-function 'message))
 	   hardlink manifest make-backup-files noninteractive)
       ;; Non-Mule XEmacs cannot handle .el files containing non-ascii chars.
@@ -777,200 +657,30 @@
 	(with-temp-file manifest
 	  (insert "pkginfo/MANIFEST.w3m\n")
 	  (dolist (log (directory-files lisp-dir nil
-					"^ChangeLog\\(\\.[0-9]+\\)?\\'"))
+					"^ChangeLog\\(?:\\.[0-9]+\\)?\\'"))
 	    (insert "lisp/w3m/" log "\n"))
 	  (dolist (el els)
 	    (insert "lisp/w3m/" el "\n")
 	    (when (member (concat el "c") elcs)
 	      (insert "lisp/w3m/" el "c\n")))
 	  (dolist (icon icons)
-	    (insert "etc/w3m/" icon "\n"))
+	    (insert "etc/images/w3m/" icon "\n"))
 	  (dolist (info infos)
 	    (insert "info/" info "\n")))
 	(message "Generating %s...done" manifest)))))
 
- ((>= emacs-major-version 21)
+ (t
   ;; Don't warn for the dummy autoloads and mis-judging of the cl
   ;; run-time functions.
   (setq byte-compile-warnings
 	(delq 'noruntime
 	      (delq 'cl-functions
-		    (copy-sequence byte-compile-warning-types)))))
-
- ((= emacs-major-version 19)
-  ;; Bind defcustom'ed variables.
-  (put 'custom-declare-variable 'byte-hunk-handler
-       (lambda (form)
-	 (if (memq 'free-vars byte-compile-warnings)
-	     (setq byte-compile-bound-variables
-		   (cons (nth 1 (nth 1 form)) byte-compile-bound-variables)))
-	 form))
-  ;; Make `locate-library' run quietly at run-time.
-  (put 'locate-library 'byte-optimizer
-       (lambda (form)
-	 (` (let ((fn (function locate-library))
-		  (msg (symbol-function 'message)))
-	      (fset 'message (function ignore))
-	      (unwind-protect
-		  (, (append '(funcall fn) (cdr form)))
-		(fset 'message msg))))))))
-
-(defun w3mhack-generate-colon-keywords-file ()
-  "Generate a file which contains a list of colon keywords to be bound at
-run-time.  The file name is specified by `w3mhack-colon-keywords-file'."
-  (let* ((srcdir default-directory)
-	 (kwds-file (expand-file-name w3mhack-colon-keywords-file srcdir))
-	 (makefile (expand-file-name "Makefile" srcdir))
-	 (buffer (get-buffer-create " *colon keywords*"))
-	 (dirs '("./" "./shimbun/"))
-	 ;; This program ignores the `defface' form since the custom package
-	 ;; supports all the colon keywords used for the face attributes.
-	 ;; However, there is one exception `:strike-through' which is not
-	 ;; available in the old custom package (`:strikethru' is for only
-	 ;; avoiding byte-compile warning).
-	 (keywords '(:strike-through :strikethru))
-	 ignores files file directories dir form elem make-backup-files)
-    (save-excursion
-      (set-buffer buffer)
-      (let (buffer-file-format
-	    format-alist
-	    insert-file-contents-post-hook insert-file-contents-pre-hook
-	    jam-zcat-filename-list jka-compr-compression-info-list)
-	(unless (and (file-exists-p kwds-file)
-		     (file-exists-p makefile)
-		     (file-newer-than-file-p kwds-file makefile))
-	  (setq
-	   ignores
-	   '(:symbol-for-testing-whether-colon-keyword-is-available-or-not
-	     ;; The following keywords will be bound by CUSTOM.
-	     :get :group :initialize :link :load :options :prefix
-	     :require :set :tag :type))
-	  ;; Add el(c) files in the following list if necessary.
-	  ;; Each file should be representative file of a package
-	  ;; which will be used together with emacs-w3m.
-	  (setq files (list (locate-library "mailcap")
-			    (locate-library "mime-def")
-			    (locate-library "path-util")
-			    (locate-library "poem")))
-	  (while files
-	    (when (setq file (pop files))
-	      (setq dir (file-name-directory file))
-	      (unless (member dir dirs)
-		(push dir dirs))))
-	  (setq directories dirs)
-	  (message "Searching for all the colon keywords in:")
-	  (while dirs
-	    (setq dir (pop dirs))
-	    (message " %s" dir)
-	    (setq files (directory-files dir t "\\.el\\(\\.gz\\|\\.bz2\\)?$"))
-	    (while files
-	      (setq file (pop files))
-	      (if (string-match "\\(\\.gz$\\)\\|\\.bz2$" file)
-		  (let ((temp (expand-file-name "w3mtemp.el" srcdir)))
-		    (when
-			(let* ((binary (if (boundp 'MULE)
-					   '*noconv*
-					 'binary))
-			       (coding-system-for-read binary)
-			       (coding-system-for-write binary)
-			       (input-coding-system binary)
-			       (output-coding-system binary)
-			       (default-process-coding-system
-				 (cons binary binary))
-			       call-process-hook)
-			  (insert-file-contents file nil nil nil t)
-			  (when
-			      (condition-case code
-				  (progn
-				    (if (match-beginning 1)
-					(call-process-region (point-min)
-							     (point-max)
-							     "gzip" t buffer
-							     nil "-cd")
-				      (call-process-region (point-min)
-							   (point-max)
-							   "bzip2" t buffer
-							   nil "-d"))
-				    t)
-				(error
-				 (erase-buffer)
-				 (message "In file %s: %s" file code)
-				 nil))
-			    (write-region (point-min) (point-max) temp nil
-					  'silent)
-			    t))
-		      (unwind-protect
-			  (insert-file-contents temp nil nil nil t)
-			(delete-file temp))))
-		(insert-file-contents file nil nil nil t))
-	      (goto-char (point-min))
-	      (while (setq form (condition-case nil
-				    (read buffer)
-				  (error nil)))
-		(while form
-		  (setq elem (car-safe form)
-			form (cdr-safe form))
-		  (unless (memq (car-safe elem)
-				'(\` backquote defcustom defface defgroup
-				  define-widget quote))
-		    (while (consp elem)
-		      (push (car elem) form)
-		      (setq elem (cdr elem)))
-		    (when (and elem
-			       (symbolp elem)
-			       (not (eq ': elem))
-			       (eq ?: (aref (symbol-name elem) 0))
-			       (not (memq elem ignores))
-			       (not (memq elem keywords)))
-		      (push elem keywords)))))))
-	  ;; `string-lessp' allows symbols as well.
-	  (setq keywords (sort keywords 'string-lessp))
-	  (erase-buffer)
-	  (insert ";;; " w3mhack-colon-keywords-file "\
- --- List of colon keywords which will be bound at run-time
-
-;; This file should be generated by make in emacs-w3m source directory.
-;; There are some colon keywords which were found in the directories
-;; listed below:
-;;
-;; "
-		  (mapconcat 'identity directories "\n;; ")
-		  "\n
-\(defvar w3m-colon-keywords)
-\(setq w3m-colon-keywords
-      '(" (symbol-name (pop keywords)) "\n\t")
-	  (let (keyword)
-	    (while keywords
-	      (setq keyword (symbol-name (pop keywords)))
-	      (when (> (+ (current-column) (length keyword)) (if keywords
-								 79
-							       77))
-		(delete-char -1)
-		(insert "\n\t"))
-	      (insert keyword " ")))
-	  (delete-char -1)
-	  (insert "))\n")
-	  (write-region (point-min) (point) kwds-file))))
-    (kill-buffer buffer)))
-
-(defun w3mhack-check-colon-keywords-file ()
-  (let* ((kwds-file (expand-file-name w3mhack-colon-keywords-file))
-	 (dir (file-name-directory kwds-file)))
-    (when (and (file-writable-p dir)
-	       (file-exists-p (expand-file-name "Makefile.in" dir)))
-      (condition-case nil
-	  :symbol-for-testing-whether-colon-keyword-is-available-or-not
-	(when (file-exists-p kwds-file)
-	  (delete-file (expand-file-name w3mhack-colon-keywords-file)))
-	(void-variable
-	 (byte-compile 'w3mhack-generate-colon-keywords-file)
-	 (w3mhack-generate-colon-keywords-file))))))
+		    (copy-sequence byte-compile-warning-types))))))
 
 (defun w3mhack-load-path ()
   "Print default value of additional load paths for w3m.el."
   (let (paths x)
     (and (or (featurep 'xemacs)
-	     (boundp 'MULE)
 	     (locate-library "mime-def"))
 	 (setq x (locate-library "poe"))
 	 (progn
@@ -980,40 +690,36 @@
 	   (push x paths)))
     (if (setq x (locate-library "mime-def"))
 	(push (file-name-directory x) paths))
-    (and (boundp 'MULE)
-	 (setq x (locate-library "custom"))
-	 (push (file-name-directory x) paths))
-    (and (boundp 'MULE)
-	 (setq x (locate-library "regexp-opt"))
-	 (push (file-name-directory x) paths))
     (if (setq x (locate-library "mew"))
 	(push (file-name-directory x) paths))
     (if (setq x (locate-library "gnus"))
 	(push (file-name-directory x) paths))
-    (and (if (featurep 'xemacs)
-	     ;; Mule-UCS does not support XEmacs versions prior to 21.2.37.
-	     (and (>= emacs-major-version 21)
-		  (or (> emacs-minor-version 2)
-		      (and (= emacs-major-version 2)
-			   (>= emacs-beta-version 37))))
-	   (>= emacs-major-version 20))
-	 (setq x (locate-library "un-define"))
-	 (push (file-name-directory x) paths))
-    (and (not (featurep 'xemacs))
-	 (<= emacs-major-version 20)
-	 (setq x (locate-library "bitmap"))
-	 (push (file-name-directory x) paths))
+    (if (setq x (locate-library "un-define"))
+	(push (file-name-directory x) paths))
     (let (print-level print-length)
       (princ (mapconcat
 	      (function directory-file-name)
 	      (nreverse paths) ":")))))
 
+;; FIXME: How to do it for Windows?
+(defun w3mhack-expand-file-name (name destdir)
+  "Convert filename NAME to the one relative to DESTDIR."
+  (if (and name destdir
+	   (eq (aref name 0) ?/)) ;; Not "NONE"?
+      (expand-file-name (substring name 1) destdir)
+    name))
+
 (defun w3mhack-what-where ()
   "Show what files should be installed and where should they go."
-  (let ((lisp-dir (pop command-line-args-left))
-	(icon-dir (pop command-line-args-left))
-	(package-dir (pop command-line-args-left))
-	(info-dir (pop command-line-args-left)))
+  (let* ((destdir (getenv "DESTDIR"))
+	 (lisp-dir (w3mhack-expand-file-name (pop command-line-args-left)
+					     destdir))
+	 (icon-dir (w3mhack-expand-file-name (pop command-line-args-left)
+					     destdir))
+	 (package-dir (w3mhack-expand-file-name (pop command-line-args-left)
+						destdir))
+	 (info-dir (w3mhack-expand-file-name (pop command-line-args-left)
+					     destdir)))
     (message "
 lispdir=%s
 ICONDIR=%s
@@ -1030,7 +736,7 @@
     (unless (string-equal "NONE/" icon-dir)
       (message "
 install-icons:
-  *.gif, *.xpm            -> %s"
+  *.gif, *.png, *.xpm     -> %s"
 	       icon-dir))
     (setq package-dir (file-name-as-directory package-dir))
     (message "
@@ -1041,7 +747,7 @@
       (message "
 install-package:
   *.el, *.elc, ChangeLog* -> %slisp/w3m/
-  *.gif, *.xpm            -> %setc/w3m/
+  *.gif, *.png, *.xpm     -> %setc/images/w3m/
   *.info, *.info-*        -> %sinfo/
   MANIFEST.w3m            -> %spkginfo/"
 	       package-dir package-dir package-dir package-dir)))
@@ -1065,10 +771,6 @@
     ;; we need to force it to load the correct one.
     (when texinfmt
       (push (file-name-directory texinfmt) load-path))
-    ;; ptexinfmt.el uses `with-temp-buffer' which is not available in
-    ;; Emacs 19.
-    (unless (fboundp 'with-temp-buffer)
-      (require 'poe))
     (load "doc/ptexinfmt.el" nil t t)
     (cd "doc")
     (if (and (string-match "-ja\\.texi\\'" file)
@@ -1081,43 +783,38 @@
 	    (find-file file)
 	    (setq buffer-read-only nil)
 	    (buffer-disable-undo (current-buffer))
-	    (cond ((boundp 'MULE)
-		   (setq output-coding-system file-coding-system))
-		  ((boundp 'buffer-file-coding-system)
-		   (setq coding-system-for-write
-			 (symbol-value 'buffer-file-coding-system))))
-	    ;; process @include before updating node
-	    ;; This might produce some problem if we use @lowersection or
-	    ;; such.
-	    (let ((input-directory default-directory)
-		  (texinfo-command-end))
+	    (when (boundp 'buffer-file-coding-system)
+	      (setq coding-system-for-write
+		    (symbol-value 'buffer-file-coding-system)))
+	    ;; Remove unsupported commands.
+	    (goto-char (point-min))
+	    (while (re-search-forward "@\\(?:end \\)?ifnottex" nil t)
+	      (replace-match ""))
+	    (goto-char (point-min))
+	    (while (search-forward "\n@iflatex\n" nil t)
+	      (delete-region (1+ (match-beginning 0))
+			     (search-forward "\n@end iflatex\n")))
+	    ;; Insert @include files.
+	    (goto-char (point-min))
+	    (set-syntax-table texinfo-format-syntax-table)
+	    (let (start texinfo-command-end filename)
 	      (while (re-search-forward "^@include" nil t)
-		(setq texinfo-command-end (point))
-		(let ((filename (concat input-directory
-					(texinfo-parse-line-arg))))
-		  (re-search-backward "^@include")
-		  (delete-region (point) (save-excursion
-					   (forward-line 1)
-					   (point)))
-		  (message "Reading included file: %s" filename)
-		  (save-excursion
-		    (save-restriction
-		      (narrow-to-region
-		       (point) (+ (point)
-				  (car (cdr (insert-file-contents filename)))))
-		      (goto-char (point-min))
-		      ;; Remove `@setfilename' line from included file,
-		      ;; if any, so @setfilename command not duplicated.
-		      (if (re-search-forward "^@setfilename"
-					     (save-excursion
-					       (forward-line 100)
-					       (point))
-					     t)
-			  (progn
-			    (beginning-of-line)
-			    (delete-region (point) (save-excursion
-						     (forward-line 1)
-						     (point))))))))))
+		(setq start (match-beginning 0)
+		      texinfo-command-end (point)
+		      filename (texinfo-parse-line-arg))
+		(delete-region start (point-at-bol 2))
+		(message "Reading included file: %s" filename)
+		(save-excursion
+		  (save-restriction
+		    (narrow-to-region
+		     (point) (+ (point)
+				(car (cdr (insert-file-contents filename)))))
+		    (goto-char (point-min))
+		    ;; Remove `@setfilename' line from included file, if any,
+		    ;; so @setfilename command not duplicated.
+		    (if (re-search-forward "^@setfilename"
+					   (point-at-eol 100) t)
+			(delete-region (point-at-bol 1) (point-at-bol 2)))))))
 	    ;; Remove ignored areas.
 	    (goto-char (point-min))
 	    (while (re-search-forward "^@ignore[\t\r ]*$" nil t)
@@ -1126,15 +823,11 @@
 				  "^@end[\t ]+ignore[\t\r ]*$" nil t)
 				 (1+ (match-end 0))
 			       (point-max))))
-	    ;; Remove unsupported commands.
+	    ;; Format @key{...}.
 	    (goto-char (point-min))
-	    (while (re-search-forward "@\\(end \\)?ifnottex" nil t)
-	      (replace-match ""))
-	    (goto-char (point-min))
-	    (while (search-forward "\n@iflatex\n" nil t)
-	      (delete-region (1+ (match-beginning 0))
-			     (search-forward "\n@end iflatex\n")))
-	    (texinfo-mode)
+	    (while (re-search-forward "@key{\\([^}]+\\)}" nil t)
+	      (replace-match "<\\1>"))
+	    ;;
 	    (texinfo-every-node-update)
 	    (set-buffer-modified-p nil)
 	    (message "texinfo formatting %s..." file)
@@ -1144,28 +837,30 @@
 	       'message
 	       (cond ((featurep 'mule)
 		      ;; Encode messages to terminal.
-		      (byte-compile
-		       (cond ((boundp 'MULE)
-			      `(lambda (fmt &rest args)
-				 (funcall ,si:message "%s"
-					  (code-convert-string
-					   (apply 'format fmt args)
-					   '*internal* '*junet*))))
-			     ((featurep 'xemacs)
-			      `(lambda (fmt &rest args)
-				 (unless (and (string-equal fmt "%s clean")
-					      (equal (car args)
-						     buffer-file-name))
+		      (let ((coding
+			     (or (and (boundp 'current-language-environment)
+				      (string-match
+				       "\\`Japanese"
+				       current-language-environment)
+				      (boundp 'locale-coding-system)
+				      locale-coding-system)
+				 'iso-2022-7bit)))
+			(byte-compile
+			 (cond ((featurep 'xemacs)
+				`(lambda (fmt &rest args)
+				   (unless (and (string-equal fmt "%s clean")
+						(equal (car args)
+						       buffer-file-name))
+				     (funcall ,si:message "%s"
+					      (encode-coding-string
+					       (apply 'format fmt args)
+					       ',coding)))))
+			       (t
+				`(lambda (fmt &rest args)
 				   (funcall ,si:message "%s"
 					    (encode-coding-string
 					     (apply 'format fmt args)
-					     'iso-2022-7bit)))))
-			     (t
-			      `(lambda (fmt &rest args)
-				 (funcall ,si:message "%s"
-					  (encode-coding-string
-					   (apply 'format fmt args)
-					   'iso-2022-7bit)))))))
+					     ',coding))))))))
 		     ((featurep 'xemacs)
 		      (byte-compile
 		       `(lambda (fmt &rest args)
@@ -1180,7 +875,7 @@
 		     `(lambda (&rest args)
 			(apply ,si:push-mark (car args) t (cddr args)))))
 	      (unwind-protect
-		  (texinfo-format-buffer nil)
+		  (texinfo-format-buffer t)
 		(fset 'message si:message)
 		(fset 'push-mark si:push-mark)))
 	    (if (buffer-modified-p)
@@ -1202,27 +897,48 @@
 
 (defun w3mhack-update-files-autoloads (files)
   "Run `update-file-autoloads' with FILES, silently in XEmacs."
-  (if (featurep 'xemacs)
-      (let ((si:message (symbol-function 'message)))
-	(defun message (fmt &rest args)
-	  "Ignore useless messages while generating autoloads."
-	  (cond ((and (string-equal "Generating autoloads for %s..." fmt)
-		      (file-exists-p (file-name-nondirectory (car args))))
-		 (funcall si:message
-			  fmt (file-name-nondirectory (car args))))
-		((string-equal "No autoloads found in %s" fmt))
-		((string-equal "Generating autoloads for %s...done" fmt))
-		(t (apply si:message fmt args))))
-	(unwind-protect
-	    (dolist (file files)
-	      (update-file-autoloads file))
-	  (fset 'message si:message)))
-    (dolist (file files)
-      (update-file-autoloads file))))
+  (cond ((featurep 'xemacs)
+	 (let ((si:message (symbol-function 'message)))
+	   (defun message (fmt &rest args)
+	     "Ignore useless messages while generating autoloads."
+	     (cond ((and (string-equal "Generating autoloads for %s..." fmt)
+			 (file-exists-p (file-name-nondirectory (car args))))
+		    (funcall si:message
+			     fmt (file-name-nondirectory (car args))))
+		   ((string-equal "No autoloads found in %s" fmt))
+		   ((string-equal "Generating autoloads for %s...done" fmt))
+		   (t (apply si:message fmt args))))
+	   (unwind-protect
+	       (dolist (file files)
+		 (update-file-autoloads file))
+	     (fset 'message si:message))))
+	((boundp 'generated-autoload-load-name)
+	 (dolist (file files)
+	   (let ((generated-autoload-load-name
+		  (file-name-sans-extension (file-name-nondirectory file))))
+	     (update-file-autoloads file))))
+	(t
+	 (dolist (file files)
+	   (update-file-autoloads file)))))
 
 (defun w3mhack-generate-load-file ()
   "Generate a file including all autoload stubs."
   (require 'autoload)
+
+  (unless (make-autoload '(define-minor-mode foo "bar") "baz")
+    ;; for XEmacs 21.4.
+    (defadvice make-autoload (around support-unsupported-forms (form file)
+				     activate)
+      "Support unsupported forms."
+      (unless ad-do-it
+	(setq ad-return-value
+	      (cond ((eq (car form) 'define-minor-mode)
+		     (put 'define-minor-mode 'doc-string-elt 3)
+		     (list 'autoload (list 'quote (nth 1 form))
+			   file (nth 2 form) t nil))
+		    (t
+		     nil))))))
+
   (let ((files (w3mhack-module-list))
 	(generated-autoload-file (expand-file-name w3mhack-load-file))
 	(make-backup-files nil)
@@ -1235,8 +951,7 @@
 	(message " `%s' is up to date" w3mhack-load-file)
       (when (fboundp 'autoload-ensure-default-file)
 	(autoload-ensure-default-file generated-autoload-file))
-      (save-excursion
-	(set-buffer (find-file-noselect generated-autoload-file))
+      (with-current-buffer (find-file-noselect generated-autoload-file)
 	(if (fboundp 'autoload-ensure-default-file)
 	    (let ((case-fold-search t))
 	      (goto-char (point-min))