From f4b020f69aa59f8dbb926b45b0e854e4702f44e3 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Wed, 25 Oct 2000 09:55:35 +0000 Subject: [PATCH] Don't inherit from global-map and don't nullify menu-bar and tool-bar bindings since keymap properties DTRT. --- lisp/ChangeLog | 6 ++++++ lisp/wid-edit.el | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8cda28228c4..f30be3f6bac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2000-10-25 Dave Love + + * 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 * wid-edit.el (widget-field-at): New function. diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index f81751e801c..f8bd157a8ee 100644 --- 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.")