Don't

inherit from global-map and don't nullify menu-bar and tool-bar
bindings since keymap properties DTRT.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cda28228c425f4d7e2067ad9b535df58071e6bb..f30be3f6bac41c3a87f4853f8e2690c28b4fce0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-25  Dave Love  <fx@gnu.org>
+
+       * wid-edit.el (widget-field-keymap, widget-text-keymap): Don't
+       inherit from global-map and don't nullify menu-bar and tool-bar
+       bindings since keymap properties DTRT.
+
 2000-10-25  Miles Bader  <miles@lsi.nec.co.jp>
 
        * wid-edit.el (widget-field-at): New function.

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index f81751e801c610ad873adfc8b8121733ce3a8326..f8bd157a8eee4a38b7436cbdb8eeebd55c9b7447 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -790,13 +790,11 @@ button end points."
 Recommended as a parent keymap for modes using widgets.")
 
 (defvar widget-global-map global-map
-  "Keymap used for events the widget does not handle themselves.")
+  "Keymap used for events a widget does not handle itself.")
 (make-variable-buffer-local 'widget-global-map)
 
 (defvar widget-field-keymap
   (let ((map (copy-keymap widget-keymap)))
-    (define-key map [menu-bar] nil)
-    (define-key map [tool-bar] nil)
     (define-key map "\C-k" 'widget-kill-line)
     (define-key map "\M-\t" 'widget-complete)
     (define-key map "\C-m" 'widget-field-activate)
@@ -804,19 +802,15 @@ Recommended as a parent keymap for modes using widgets.")
     ;; ordinary beginning-of-line/end-of-line do the right thing.
     ;;  (define-key map "\C-a" 'widget-beginning-of-line)
     ;;  (define-key map "\C-e" 'widget-end-of-line)
-    (set-keymap-parent map global-map)
     map)
   "Keymap used inside an editable field.")
 
 (defvar widget-text-keymap
   (let ((map (copy-keymap widget-keymap)))
-    (define-key map [menu-bar] nil)
-    (define-key map [tool-bar] nil)
     ;; Since the widget code uses a `field' property to identify fields,
     ;; ordinary beginning-of-line/end-of-line do the right thing.
     ;;  (define-key map "\C-a" 'widget-beginning-of-line)
     ;;  (define-key map "\C-e" 'widget-end-of-line)
-    (set-keymap-parent map global-map)
     map)
   "Keymap used inside a text field.")