--- a/lisp/hm--html-menus/hm--html-keys.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/hm--html-menus/hm--html-keys.el	Mon Aug 13 09:02:59 2007 +0200
@@ -1,11 +1,11 @@
-;;; $Id: hm--html-keys.el,v 1.5 1997/03/26 22:42:37 steve Exp $
+;;; $Id: hm--html-keys.el,v 1.1.1.1 1996/12/18 22:43:20 steve Exp $
 ;;; 
-;;; Copyright (C) 1995, 1996, 1997 Heiko Muenkel
+;;; Copyright (C) 1995, 1996 Heiko Muenkel
 ;;; email: muenkel@tnt.uni-hannover.de
 ;;;
 ;;;  This program is free software; you can redistribute it and/or modify
 ;;;  it under the terms of the GNU General Public License as published by
-;;;  the Free Software Foundation; either version 2, or (at your option)
+;;;  the Free Software Foundation; either version 1, or (at your option)
 ;;;  any later version.
 ;;;
 ;;;  This program is distributed in the hope that it will be useful,
@@ -27,6 +27,9 @@
 ;;;	Put this file in one of your load path directories.
 ;;;
 
+;; This is necessary to get the definition of hm--html-mode-prefix-key.
+(require 'hm--html-configuration)
+
 (if (adapt-emacs19p)
     (progn
 
@@ -56,7 +59,8 @@
   (define-key hm--html-noregion-anchor-map "f" 'hm--html-add-file-link)
   (define-key hm--html-noregion-anchor-map "\C-f" 'hm--html-add-ftp-link)
   (define-key hm--html-noregion-anchor-map "n" 'hm--html-add-news-link)
-  (define-key hm--html-noregion-anchor-map "m" 'hm--html-add-mail-box-link)
+  (define-key hm--html-noregion-anchor-map "m" 'hm--html-add-mail-link)
+;  (define-key hm--html-noregion-anchor-map "\C-m" 'hm--html-add-mailto-link)
   (define-key hm--html-noregion-anchor-map 
     [(control m)] 'hm--html-add-mailto-link)
   (define-key hm--html-noregion-anchor-map "w" 'hm--html-add-direct-wais-link)
@@ -84,7 +88,9 @@
   (define-key hm--html-region-anchor-map 
     "\C-f" 'hm--html-add-ftp-link-to-region)
   (define-key hm--html-region-anchor-map "n" 'hm--html-add-news-link-to-region)
-  (define-key hm--html-region-anchor-map "m" 'hm--html-add-mail-box-link-to-region)
+  (define-key hm--html-region-anchor-map "m" 'hm--html-add-mail-link-to-region)
+;  (define-key hm--html-region-anchor-map 
+;    "\C-m" 'hm--html-add-mailto-link-to-region)
   (define-key hm--html-region-anchor-map
     [(control m)] 'hm--html-add-mailto-link-to-region)
   (define-key hm--html-region-anchor-map 
@@ -108,7 +114,6 @@
     ()
   (setq	hm--html-noregion-frame-map (make-sparse-keymap))
   (define-key hm--html-noregion-frame-map "f" 'hm--html-add-full-html-frame)
-  (define-key hm--html-noregion-frame-map [(control d)] 'hm--html-add-doctype)
   (define-key hm--html-noregion-frame-map [(control h)] 'hm--html-add-html) 
   (define-key hm--html-noregion-frame-map [(meta h)] 'hm--html-add-head)
   (define-key hm--html-noregion-frame-map "b" 'hm--html-add-body)
@@ -116,10 +121,7 @@
     [(control t)] 'hm--html-add-title-and-header)
   (define-key hm--html-noregion-frame-map "t" 'hm--html-add-title)
   (define-key hm--html-noregion-frame-map "h" 'hm--html-add-header)
-  (define-key hm--html-noregion-frame-map "m" 'hm--html-add-meta)
   (define-key hm--html-noregion-frame-map "n" 'hm--html-add-normal-node-link)
-  (define-key hm--html-noregion-frame-map "i" 'hm--html-add-isindex)
-  (define-key hm--html-noregion-frame-map [(meta d)] 'hm--html-add-base)
   (define-key hm--html-noregion-frame-map "a" 'hm--html-add-address)
   (define-key hm--html-noregion-frame-map "s" 'hm--html-add-signature)
   (define-key hm--html-noregion-frame-map 
@@ -179,8 +181,6 @@
   (define-key hm--html-noregion-structure-map "p" 'hm--html-add-paragraph)
   (define-key hm--html-noregion-structure-map 
     "\C-p" 'hm--html-add-paragraph-separator)
-  (define-key hm--html-noregion-structure-map
-    [(meta d)] 'hm--html-add-document-division)
   (define-key hm--html-noregion-structure-map "\C-m" 'hm--html-add-line-break)
   (define-key hm--html-noregion-structure-map 
     "h" 'hm--html-add-horizontal-rule)
@@ -192,28 +192,28 @@
 (if hm--html-region-structure-map
     ()
   (setq hm--html-region-structure-map (make-sparse-keymap))
-  (define-key hm--html-region-structure-map
+  (define-key hm--html-noregion-structure-map
     "i" 'hm--html-add-list-or-menu-item-to-region)
   (define-key hm--html-region-structure-map "m" 'hm--html-add-menu-to-region)
   (define-key hm--html-region-structure-map "u" 'hm--html-add-list-to-region)
   (define-key hm--html-region-structure-map 
     "o" 'hm--html-add-numberlist-to-region)
   (define-key hm--html-region-structure-map 
-    "d" 'hm--html-add-directorylist-to-region)
+    "d" 'hm--html-add-directory-list-to-region)
   (define-key hm--html-region-structure-map 
     "\C-dl" 'hm--html-add-description-list-to-region)
   (define-key hm--html-region-structure-map 
     "\C-dt" 'hm--html-add-description-title-to-region)
   (define-key hm--html-region-structure-map 
     "\C-de" 'hm--html-add-description-entry-to-region)
+;  (define-key hm--html-region-structure-map 
+;    "\C-d\C-t" 'html-add-description-title-and-entry-to-region))
   (define-key hm--html-region-structure-map
     "\C-tt" 'hm--html-add-table-to-region)
   (define-key hm--html-region-structure-map 
     "\C-t\C-t" 'hm--html-add-table-title-to-region)
   (define-key hm--html-region-structure-map 
     "p" 'hm--html-add-paragraph-to-region)
-  (define-key hm--html-region-structure-map
-    [(meta d)] 'hm--html-add-document-division-to-region)
   )
 
 (defvar hm--html-noregion-formating-paragraph-map nil
@@ -222,24 +222,16 @@
 (if hm--html-noregion-formating-paragraph-map
     ()
   (setq hm--html-noregion-formating-paragraph-map (make-sparse-keymap))
-;  (define-key hm--html-noregion-formating-paragraph-map
-;    "o" 'hm--html-add-plaintext)
   (define-key hm--html-noregion-formating-paragraph-map
-    "p" 'hm--html-add-preformated)
+    "o" 'hm--html-add-plaintext)
+  (define-key hm--html-noregion-formating-paragraph-map
+    "w" 'hm--html-add-preformated)
   (define-key hm--html-noregion-formating-paragraph-map
     "b" 'hm--html-add-blockquote)
   (define-key hm--html-noregion-formating-paragraph-map
-    "\C-b" 'hm--html-add-basefont)
-  (define-key hm--html-noregion-formating-paragraph-map
-    "f" 'hm--html-add-font)
-  (define-key hm--html-noregion-formating-paragraph-map
-    "c" 'hm--html-add-center)
+    "l" 'hm--html-add-listing)
   (define-key hm--html-noregion-formating-paragraph-map
-    "\C-c" 'hm--html-add-comment)
-;  (define-key hm--html-noregion-formating-paragraph-map
-;    "l" 'hm--html-add-listing)
-;  (define-key hm--html-noregion-formating-paragraph-map
-;    "a" 'hm--html-add-abstract)
+    "a" 'hm--html-add-abstract)
   )
 
 (defvar hm--html-region-formating-paragraph-map nil
@@ -248,24 +240,16 @@
 (if hm--html-region-formating-paragraph-map
     ()
   (setq hm--html-region-formating-paragraph-map (make-sparse-keymap))
-;  (define-key hm--html-region-formating-paragraph-map
-;    "o" 'hm--html-add-plaintext-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "p" 'hm--html-add-preformated-to-region)
+    "o" 'hm--html-add-plaintext-to-region)
+  (define-key hm--html-region-formating-paragraph-map
+    "w" 'hm--html-add-preformated-to-region)
   (define-key hm--html-region-formating-paragraph-map
     "b" 'hm--html-add-blockquote-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "\C-b" 'hm--html-add-basefont-to-region)
-  (define-key hm--html-region-formating-paragraph-map
-    "f" 'hm--html-add-font-to-region)
-  (define-key hm--html-region-formating-paragraph-map
-    "c" 'hm--html-add-center-to-region)
+    "l" 'hm--html-add-listing-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "\C-c" 'hm--html-add-comment-to-region)
-;  (define-key hm--html-region-formating-paragraph-map
-;    "l" 'hm--html-add-listing-to-region)
-;  (define-key hm--html-region-formating-paragraph-map
-;    "a" 'hm--html-add-abstract-to-region)
+    "a" 'hm--html-add-abstract-to-region)
   )
 
 (defvar hm--html-noregion-formating-word-map nil
@@ -334,18 +318,11 @@
 (if hm--html-noregion-include-map
     ()
   (setq hm--html-noregion-include-map (make-sparse-keymap))
-  (define-key hm--html-noregion-include-map
-    [(control i) (t)] 'hm--html-add-image-top)
-  (define-key hm--html-noregion-include-map
-    [(control i) (m)] 'hm--html-add-image-middle)
-  (define-key hm--html-noregion-include-map
-    [(control i) (b)] 'hm--html-add-image-bottom)
-  (define-key hm--html-noregion-include-map "i" 'hm--html-add-image)
-  (define-key hm--html-noregion-include-map [(meta i)] 'hm--html-add-image-map)
-  (define-key hm--html-noregion-include-map "m" 'hm--html-add-map)
-  (define-key hm--html-noregion-include-map [(control a)] 'hm--html-add-area)
+  (define-key hm--html-noregion-include-map "t" 'hm--html-add-image-top)
+  (define-key hm--html-noregion-include-map "m" 'hm--html-add-image-middle)
+  (define-key hm--html-noregion-include-map "b" 'hm--html-add-image-bottom)
   (define-key hm--html-noregion-include-map "a" 'hm--html-add-applet)
-  (define-key hm--html-noregion-include-map "p" 'hm--html-add-applet-parameter)
+  (define-key hm--html-noregion-include-map "p" 'hm--html-add-applet)
   )
 
 (defvar hm--html-region-include-map nil
@@ -354,8 +331,6 @@
 (if hm--html-region-include-map
     ()
   (setq hm--html-region-include-map (make-sparse-keymap))
-  (define-key hm--html-region-include-map "m" 'hm--html-add-map-to-region)
-  (define-key hm--html-region-include-map "a" 'hm--html-add-applet-to-region)
   )
 
 ;(defvar hm--html-noregion-text-elements-map nil