2 files changed, 18 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dc16834d0e..6ad287a3345 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * menu-bar.el (top-level): Deactivate clipboard-kill-region and
+        clipboard-yank when the buffer is read-only.
+
+        * cus-edit.el (custom-field-keymap): Move to other Custom mode
+        keymaps such that it's before the definition of Custom-mode-menu.
+        (Custom-mode-menu): Show it for custom-field-keymap too.
+
 2007-11-19  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el: Update commentary.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b90892fdd29..cdb39c1fe5e 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -491,6 +491,14 @@
     map)
   "Local keymap for links in `custom-mode'.")
 
+(defvar custom-field-keymap
+  (let ((map (copy-keymap widget-field-keymap)))
+    (define-key map "\C-c\C-c" 'Custom-set)
+    (define-key map "\C-x\C-s" 'Custom-save)
+    map)
+  "Keymap used inside editable fields in customization buffers.")
+
+(widget-put (get 'editable-field 'widget-type) :keymap custom-field-keymap)
 
 ;;; Utilities.
 
@@ -4438,7 +4446,7 @@ The format is suitable for use with `easy-menu-define'."
 ;;; Toolbar and menubar support
 
 (easy-menu-define
-  Custom-mode-menu custom-mode-map
+  Custom-mode-menu (list custom-mode-map custom-field-keymap)
   "Menu used in customization buffers."
   (nconc (list "Custom"
                (customize-menu-create 'customize))
@@ -4476,15 +4484,6 @@ The format is suitable for use with `easy-menu-define'."
         (widget-apply-action button event)
       (error "You can't edit this part of the Custom buffer"))))
 
-(defvar custom-field-keymap
-  (let ((map (copy-keymap widget-field-keymap)))
-    (define-key map "\C-c\C-c" 'Custom-set)
-    (define-key map "\C-x\C-s" 'Custom-save)
-    map)
-  "Keymap used inside editable fields in customization buffers.")
-
-(widget-put (get 'editable-field 'widget-type) :keymap custom-field-keymap)
-
 (defun Custom-goto-parent ()
   "Go to the parent group listed at the top of this buffer.
 If several parents are listed, go to the first of them."