map-keymap usage fixed. unread-command-event used rather than fboundp(map-keymap)

src/completing-read.el

@@ -292,7 +292,7 @@ When C-G is pressed then lyskom-end-of-command is evaled."
 	(and completion-buffer
 	     (get-buffer-window completion-buffer)))
   (use-local-map lyskom-completing-map)
-  (if (fboundp 'map-keymap)		;Special for lucid-emacs.
+  (if (boundp 'unread-command-event)		;Special for lucid-emacs.
       (setq unread-command-event last-command-event)
     (setq unread-command-char last-command-char)))
 
@@ -417,7 +417,7 @@ parst matching ([^)]) in string and alist are disgarded."
    ((fboundp 'map-keymap)		;lucid-emacs' way of doing things.
     (map-keymap 
      (function (lambda (keydesc binding)
-		 (define-key lyskom-initial-completing-map keydesc 
+		 (define-key lyskom-initial-completing-map (vector keydesc)
 		   'lyskom-hack-minibuf)))
      global-map))
    ((string-match "^19" emacs-version)

src/edit-text.el

@@ -340,7 +340,7 @@ Entry to this mode runs lyskom-edit-mode-hook."
 
 (defun kom-edit-insert-digit-text ()
   (interactive)
-  (if (fboundp 'map-keymap)		;Special for lucid-emacs
+  (if (boundp 'unread-command-event)	;Special for lucid-emacs
       (setq unread-command-event last-command-event)
     (setq unread-command-char last-command-char))
   (call-interactively 'kom-edit-insert-text nil))
@@ -744,7 +744,7 @@ BUG: does not descend in the maps."
 	(map-keymap
 	 (function
 	  (lambda (event function)
-	    (define-key map event function)))
+	    (define-key map (vector event) function)))
 	 newmap))
        ((and (string-match "^19" emacs-version)
 	     (arrayp (car (cdr newmap))))