(widget-field-keymap, widget-text-keymap): Define

the tool-bar map as nil, as for the menu-bar.  Otherwise, we'll
get duplicate tool-bar entries because we'll see the global ones
on more than one path through keymaps.

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index a17d6b83e5b9d10c747c4a41164f783877c4a0d1..debbf510f4ff4e68c56035fc2ec3e4b4abeff8a7 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -781,6 +781,7 @@ Recommended as a parent keymap for modes using widgets.")
 (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)
@@ -792,7 +793,8 @@ Recommended as a parent keymap for modes using widgets.")
 
 (defvar widget-text-keymap
   (let ((map (copy-keymap widget-keymap)))
-    (define-key map [menu-bar] 'nil)
+    (define-key map [menu-bar] nil)
+    (define-key map [tool-bar] nil)
     (define-key map "\C-a" 'widget-beginning-of-line)
     (define-key map "\C-e" 'widget-end-of-line)
     (set-keymap-parent map global-map)