--- a/lisp/w3/w3-emulate.el	Mon Aug 13 08:49:44 2007 +0200
+++ b/lisp/w3/w3-emulate.el	Mon Aug 13 08:50:05 2007 +0200
@@ -1,7 +1,7 @@
 ;;; w3-emulate.el --- All variable definitions for emacs-w3
 ;; Author: wmperry
-;; Created: 1997/01/22 16:28:30
-;; Version: 1.6
+;; Created: 1997/02/04 19:21:18
+;; Version: 1.11
 ;; Keywords: comm, help, hypermedia
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -80,9 +80,9 @@
 (define-key w3-netscape-emulation-minor-mode-map [right] 'scroll-left)
 (define-key w3-netscape-emulation-minor-mode-map [left] 'scroll-right)
 (define-key w3-netscape-emulation-minor-mode-map [(meta left)]
-  'w3-backward-in-history)
+  'w3-history-backward)
 (define-key w3-netscape-emulation-minor-mode-map [(meta right)]
-  'w3-forward-in-history)
+  'w3-history-forward)
 
 (defun turn-on-netscape-emulation ()
   (interactive)
@@ -186,31 +186,72 @@
     (setq w3-lynx-emulation-minor-mode t
 	  w3-netscape-emulation-minor-mode nil))))
 
+;; The list of keybindings for lynx minor mode was compiled from:
+;; http://www.crl.com/~subir/lynx/lynx_help/keystroke_commands/keystroke_help.htm
+
+;; Movement
+(define-key w3-lynx-emulation-minor-mode-map [up]   'w3-widget-backward)
+(define-key w3-lynx-emulation-minor-mode-map [down] 'w3-widget-forward)
+(define-key w3-lynx-emulation-minor-mode-map [right] 'w3-follow-link)
+(define-key w3-lynx-emulation-minor-mode-map [left] 'w3-history-backward)
+
+;; Scrolling
 (define-key w3-lynx-emulation-minor-mode-map "+"    'w3-scroll-up)
 (define-key w3-lynx-emulation-minor-mode-map "-"    'scroll-down)
 (define-key w3-lynx-emulation-minor-mode-map "b"    'scroll-down)
-(define-key w3-lynx-emulation-minor-mode-map "a"    'w3-hotlist-add-document)
-(define-key w3-lynx-emulation-minor-mode-map "c"    'w3-mail-document-author)
-(define-key w3-lynx-emulation-minor-mode-map "e"    'w3-edit-source)
-(define-key w3-lynx-emulation-minor-mode-map "g"    'w3-fetch)
-(define-key w3-lynx-emulation-minor-mode-map "i"    'ignore)
-(define-key w3-lynx-emulation-minor-mode-map "m"    'w3)
-(define-key w3-lynx-emulation-minor-mode-map "o"    'ignore)
-(define-key w3-lynx-emulation-minor-mode-map "p"    'w3-print-this-url)
-(define-key w3-lynx-emulation-minor-mode-map "q"    'w3-quit)
-(define-key w3-lynx-emulation-minor-mode-map "/"    'w3-search-forward)
-(define-key w3-lynx-emulation-minor-mode-map "s"    'w3-search-forward)
-(define-key w3-lynx-emulation-minor-mode-map "n"    'w3-search-again)
-(define-key w3-lynx-emulation-minor-mode-map "v"    'w3-show-hotlist)
-(define-key w3-lynx-emulation-minor-mode-map "="    'w3-document-information)
+(define-key w3-lynx-emulation-minor-mode-map "\C-a" 'w3-start-of-document)
+(define-key w3-lynx-emulation-minor-mode-map "\C-e" 'w3-end-of-document)
+(define-key w3-lynx-emulation-minor-mode-map "\C-f" 'scroll-down)
+(define-key w3-lynx-emulation-minor-mode-map "\C-n" 'ignore) ; down 2
+(define-key w3-lynx-emulation-minor-mode-map "\C-p" 'ignore) ; up 2
+(define-key w3-lynx-emulation-minor-mode-map ")"    'ignore) ; forward half
+(define-key w3-lynx-emulation-minor-mode-map "("    'ignore) ; back half
+(define-key w3-lynx-emulation-minor-mode-map "#"    'w3-toggle-toolbar)
+
+;; Dired bindings don't have any meaning for us
+
+;; Other
+(define-key w3-lynx-emulation-minor-mode-map "?"   'w3-help)
+(define-key w3-lynx-emulation-minor-mode-map "a"   'w3-hotlist-add-document)
+(define-key w3-lynx-emulation-minor-mode-map "c"   'w3-mail-document-author)
+(define-key w3-lynx-emulation-minor-mode-map "d"   'w3-download-url) 
+(define-key w3-lynx-emulation-minor-mode-map "e"   'ignore) ; edit current
+(define-key w3-lynx-emulation-minor-mode-map "f"   'dired)
+(define-key w3-lynx-emulation-minor-mode-map "g"   'w3-fetch)
+(define-key w3-lynx-emulation-minor-mode-map "h"   'w3-help)
+(define-key w3-lynx-emulation-minor-mode-map "i"   'ignore)
+(define-key w3-lynx-emulation-minor-mode-map "j"   'w3-use-hotlist)
+(define-key w3-lynx-emulation-minor-mode-map "k"   'describe-mode)
+(define-key w3-lynx-emulation-minor-mode-map "l"   'w3-complete-link)
+(define-key w3-lynx-emulation-minor-mode-map "m"   'w3)
+(define-key w3-lynx-emulation-minor-mode-map "n"   'w3-search-again)
+(define-key w3-lynx-emulation-minor-mode-map "o"   'w3-preferences-edit)
+(define-key w3-lynx-emulation-minor-mode-map "p"   'w3-print-this-url)
+(define-key w3-lynx-emulation-minor-mode-map "q"   'w3-quit)
+(define-key w3-lynx-emulation-minor-mode-map "r"   'w3-hotlist-delete)
+(define-key w3-lynx-emulation-minor-mode-map "t"   'ignore) ; tag
+(define-key w3-lynx-emulation-minor-mode-map "u"   'w3-history-backward)
+(define-key w3-lynx-emulation-minor-mode-map "/"   'w3-search-forward)
+(define-key w3-lynx-emulation-minor-mode-map "v"   'w3-show-hotlist)
+(define-key w3-lynx-emulation-minor-mode-map "V"   'w3-show-hotlist)
+(define-key w3-lynx-emulation-minor-mode-map "x"   'w3-follow-link)
+(define-key w3-lynx-emulation-minor-mode-map "z"   'keyboard-quit)
+(define-key w3-lynx-emulation-minor-mode-map "="   'w3-document-information)
+(define-key w3-lynx-emulation-minor-mode-map "\\"  'w3-source-document)
+(define-key w3-lynx-emulation-minor-mode-map "!"   'shell)
+(define-key w3-lynx-emulation-minor-mode-map "'"   'ignore) ; toggle comment
+(define-key w3-lynx-emulation-minor-mode-map "`"   'ignore) ; toggle comment
+(define-key w3-lynx-emulation-minor-mode-map "*"   'ignore) ; toggle image_links
+(define-key w3-lynx-emulation-minor-mode-map "@"   'ignore) ; toggle raw 8-bit
+(define-key w3-lynx-emulation-minor-mode-map "["   'ignore) ; pseudo-inlines
+(define-key w3-lynx-emulation-minor-mode-map "]"   'ignore) ; send head
+(define-key w3-lynx-emulation-minor-mode-map "\""  'ignore) ; toggle quoting
 (define-key w3-lynx-emulation-minor-mode-map "\C-r" 'w3-reload-document)
 (define-key w3-lynx-emulation-minor-mode-map "\C-w" 'w3-refresh-buffer)
-(define-key w3-lynx-emulation-minor-mode-map "\\"   'w3-source-document)
-(define-key w3-lynx-emulation-minor-mode-map "!"    'shell)
-(define-key w3-lynx-emulation-minor-mode-map [up]   'w3-widget-backward)
-(define-key w3-lynx-emulation-minor-mode-map [down] 'w3-widget-forward)
-(define-key w3-lynx-emulation-minor-mode-map [right] 'w3-follow-link)
-(define-key w3-lynx-emulation-minor-mode-map [left] 'w3-backward-in-history)
+(define-key w3-lynx-emulation-minor-mode-map "\C-u" 'ignore) ; erase input
+(define-key w3-lynx-emulation-minor-mode-map "\C-g" 'keyboard-quit)
+(define-key w3-lynx-emulation-minor-mode-map "\C-t" 'ignore) ; toggle trace
+(define-key w3-lynx-emulation-minor-mode-map "\C-k" 'ignore) ; cookie jar
 
 (provide 'w3-emulate)