--- /usr/local/share/emacs/site-lisp/w3-20010924/w3.el	Wed Sep 26 21:22:48 2001
+++ ./w3.el	Mon Oct  1 09:38:39 2001
@@ -152,7 +152,7 @@
   (let* ((encoding (mm-handle-encoding handle))
 	 (charset (or (mail-content-type-get (mm-handle-type handle)
 					     'charset)
-		      "iso-8859-1"))
+		      w3-default-charset))
 	 (type (mm-handle-media-type handle))
 	 (coding-system (mm-charset-to-coding-system charset)))
     (if (and (not coding-system)
--- /usr/local/share/emacs/site-lisp/w3-20010924/w3-vars.el	Wed Sep  5 08:56:07 2001
+++ ./w3-vars.el	Mon Oct  1 10:04:13 2001
@@ -240,6 +240,9 @@
     )
   "*An assoc list of entity names and how to actually display them.")
 
+(defvar w3-default-charset 'iso-8859-1 
+  "default coding-system")
+   
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Menu definitions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -276,6 +279,8 @@
 ( (label . function)), function is called with one argument, the URL of
 the link.  Each label can have exactly one `%s' that will be replaced by
 the URL of the link.")
+
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Variables internal to W3, you should not change any of these
--- /usr/local/share/emacs/site-lisp/w3-20010924/w3-menu.el	Wed Sep  5 08:56:07 2001
+++ ./w3-menu.el	Mon Oct  1 10:07:10 2001
@@ -55,10 +55,11 @@
 (defvar w3-menu-fsfemacs-view-menu nil)
 (defvar w3-menu-fsfemacs-options-menu nil)
 (defvar w3-menu-fsfemacs-style-menu nil)
+(defvar w3-menu-fsfemacs-charset-menu nil)
 (defvar w3-menu-fsfemacs-search-menu nil)
 (defvar w3-menu-w3-menubar nil)
 
-(defcustom w3-use-menus '(file edit view go bookmark options buffers style
+(defcustom w3-use-menus '(file edit view go bookmark charset options buffers style
 			       emacs nil help)
   "*Non-nil value causes W3 to provide a menu interface.
 A value that is a list causes W3 to install its own menubar.
@@ -78,6 +79,7 @@
 buffers		-- The standard buffers menu
 emacs		-- A toggle button to switch back to normal emacs menus
 style		-- Control style information and who gets to set what
+charset         -- default charset
 search          -- Various search engines
 help		-- The help menu
 nil		-- ** special **
@@ -98,6 +100,7 @@
 	      (const :tag "Options" :value options)
 	      (const :tag "Buffer list" :value buffers)
 	      (const :tag "Stylesheet information" :value style)
+	      (const :tag "Default Chaset" :value style)
 	      (const :tag "Search engines" :value search)
 	      (const :tag "Toggle to default menus" :value emacs)
 	      (const :tag "Separator" :value nil)
@@ -438,6 +441,21 @@
    )
   "W3 menu style list.")
 
+(defconst w3-menu-charset-menu
+  (list
+   "charset"
+   ["iso-2022-jp"    (progn (setq w3-default-charset 'iso-2022-jp)
+			    (w3-reload-document)) t]
+   ["euc-jp"         (progn (setq w3-default-charset 'euc-jp)
+			    (w3-reload-document)) t]
+   ["shift_jis"      (progn (setq w3-default-charset 'shift_jis)
+			    (w3-reload-document)) t]
+   ["iso-8859-1"     (progn (setq w3-default-charset 'iso-8859-1)
+			    (w3-reload-document)) t]
+   "---"
+   )
+  "W3 menu charset list.")
+
 (defconst w3-menu-buffer-menu
   (if (featurep 'xemacs)
       '("Buffers"
@@ -501,6 +519,8 @@
 			  w3-menu-options-menu)
 	(easy-menu-define w3-menu-fsfemacs-style-menu (list dummy) nil
 			  w3-menu-style-menu)
+	(easy-menu-define w3-menu-fsfemacs-charset-menu (list dummy) nil
+			  w3-menu-charset-menu)
 	(easy-menu-define w3-menu-fsfemacs-search-menu (list dummy) nil
 			  w3-menu-search-menu)
 
@@ -523,6 +543,8 @@
 	       '(
 		 (bookmark
 		  (cons "Bookmark" w3-menu-fsfemacs-bookmark-menu))
+		 (charset
+		  (cons "Charset" w3-menu-fsfemacs-charset-menu))
 		 (debug
 		  (cons "Debug" w3-menu-fsfemacs-debug-menu))
 		 (edit
@@ -558,7 +580,7 @@
 	      (menu-list 
 	       (if (consp w3-use-menus)
 		   (reverse w3-use-menus)
-		 (list 'help nil 'emacs 'buffers 'options 'bookmark
+		 (list 'help nil 'emacs 'buffers 'options 'charset 'bookmark
 		       'go 'view 'edit 'file))))
 	  (while menu-list
 	    (if (null (car menu-list))
@@ -577,6 +599,7 @@
   (let ((menu-alist
 	 '((bookmark . w3-menu-bookmark-menu)
 	   (style    . w3-menu-style-menu)
+	   (charset  . w3-menu-charset-menu)
 	   (buffers  . w3-menu-buffer-menu)
 	   (debug    . w3-menu-debug-menu)
 	   (edit     . w3-menu-edit-menu)