# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1042404368 0
# Node ID f8c302d7433bc33bdd17883469ad91e364ad6136
# Parent  05ad80e1c6d26d84f242f470dc5665396404fbd8
(emerge-setup-fixed-keymaps): Use command remapping instead of
substitute-key-definition.

diff -r 05ad80e1c6d2 -r f8c302d7433b lisp/emerge.el
--- a/lisp/emerge.el	Sun Jan 12 20:45:19 2003 +0000
+++ b/lisp/emerge.el	Sun Jan 12 20:46:08 2003 +0000
@@ -400,10 +400,8 @@
   ;; Allow emerge-fast-keymap to be referenced indirectly
   (fset 'emerge-fast-keymap emerge-fast-keymap)
   ;; Suppress write-file and save-buffer
-  (substitute-key-definition 'write-file 'emerge-query-write-file
-			     emerge-fast-keymap (current-global-map))
-  (substitute-key-definition 'save-buffer 'emerge-query-save-buffer
-			     emerge-fast-keymap (current-global-map))
+  (define-key emerge-fast-keymap [remap write-file] 'emerge-query-write-file)
+  (define-key emerge-fast-keymap [remap save-buffer] 'emerge-query-save-buffer)
 
   (define-key emerge-basic-keymap [menu-bar] (make-sparse-keymap))
 
@@ -1432,10 +1430,8 @@
   (substitute-key-definition 'save-buffer
 			     'emerge-query-save-buffer
 			     emerge-edit-keymap)
-  (substitute-key-definition 'write-file 'emerge-query-write-file
-			     emerge-edit-keymap (current-global-map))
-  (substitute-key-definition 'save-buffer 'emerge-query-save-buffer
-			     emerge-edit-keymap (current-global-map))
+  (define-key emerge-edit-keymap [remap write-file] 'emerge-query-write-file)
+  (define-key emerge-edit-keymap [remap save-buffer] 'emerge-query-save-buffer)
   (use-local-map emerge-fast-keymap)
   (setq emerge-edit-mode nil)
   (setq emerge-fast-mode t))