[slime-cvs] CVS slime

[alendvai]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv27499

Modified Files:
	slime.el 
Log Message:
Use set-parent-keymaps when available (xemacs only for now) when setting up slime-read-expression-map.

The effect of this is that the minibuffer will have all the slime-mode-map keys where minibuffer-local-map is not overriding.


--- /project/slime/cvsroot/slime/slime.el	2007/01/03 10:56:14	1.729
+++ /project/slime/cvsroot/slime/slime.el	2007/01/03 11:02:52	1.730
@@ -6249,15 +6249,19 @@
           (minibuffer-message text))
       (message "%s" text))))
 
-(defvar slime-read-expression-map (make-sparse-keymap)
+(defvar slime-read-expression-map
+  (let ((map (make-sparse-keymap)))
+    (if (fboundp 'set-keymap-parents) ; xemacs only at the time of writing
+        (set-keymap-parents map (list minibuffer-local-map slime-mode-map))
+        (progn
+          (set-keymap-parent map minibuffer-local-map)
+          (define-key map (kbd "\t") 'slime-complete-symbol)
+          (define-key map (kbd "\M-\t") 'slime-complete-symbol)))
+    map)
   "Minibuffer keymap used for reading CL expressions.")
 
-(set-keymap-parent slime-read-expression-map minibuffer-local-map)
 (set-keymap-parent slime-repl-history-map slime-read-expression-map)
 
-(define-key slime-read-expression-map "\t" 'slime-complete-symbol)
-(define-key slime-read-expression-map "\M-\t" 'slime-complete-symbol)
-
 (defvar slime-read-expression-history '()
   "History list of expressions read from the minibuffer.")