[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv29905

Modified Files:
	ChangeLog slime-c-p-c.el slime-fuzzy.el slime-presentations.el 
Log Message:
* slime-c-p-c.el, slime-fuzzy.el: Don't define keys on slime-repl-mode-map
if slime-repl isn't loaded.
* slime-presentations.el: Refuse to load if slime-repl isn't loaded.
Reported by Robert Goldman.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/03/13 03:08:04	1.358
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/03/20 08:27:50	1.359
@@ -1,3 +1,10 @@
+2010-03-20  Stas Boukarev  <stassats at gmail.com>
+
+	* slime-c-p-c.el, slime-fuzzy.el: Don't define keys on slime-repl-mode-map
+	if slime-repl isn't loaded.
+	* slime-presentations.el: Refuse to load if slime-repl isn't loaded.
+	Reported by Robert Goldman.
+
 2010-03-13  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-asdf.el: use slime-from-lisp-filename so that slime-tramp can work.
--- /project/slime/cvsroot/slime/contrib/slime-c-p-c.el	2010/02/15 21:42:37	1.21
+++ /project/slime/cvsroot/slime/contrib/slime-c-p-c.el	2010/03/20 08:27:50	1.22
@@ -176,14 +176,16 @@
    `(progn
       (setq slime-complete-symbol-function ',slime-complete-symbol-function)
       (remove-hook 'slime-connected-hook 'slime-c-p-c-on-connect)
-      (define-key slime-mode-map "\C-c\C-s"
-	',(lookup-key slime-mode-map "\C-c\C-s"))
-      (define-key slime-repl-mode-map "\C-c\C-s"
-	',(lookup-key slime-repl-mode-map "\C-c\C-s")))
+      ,@(when (featurep 'slime-repl)
+              `((define-key slime-mode-map "\C-c\C-s"
+                  ',(lookup-key slime-mode-map "\C-c\C-s"))
+                (define-key slime-repl-mode-map "\C-c\C-s"
+                  ',(lookup-key slime-repl-mode-map "\C-c\C-s")))))
    slime-c-p-c-init-undo-stack)
   (setq slime-complete-symbol-function 'slime-complete-symbol*)
   (define-key slime-mode-map "\C-c\C-s" 'slime-complete-form)
-  (define-key slime-repl-mode-map "\C-c\C-s" 'slime-complete-form))
+  (when (featurep 'slime-repl)
+    (define-key slime-repl-mode-map "\C-c\C-s" 'slime-complete-form)))
 
 (defun slime-c-p-c-unload ()
   (while slime-c-p-c-init-undo-stack
--- /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2010/02/19 10:38:07	1.16
+++ /project/slime/cvsroot/slime/contrib/slime-fuzzy.el	2010/03/20 08:27:50	1.17
@@ -600,6 +600,7 @@
 
 (defun slime-fuzzy-bind-keys ()
   (define-key slime-mode-map "\C-c\M-i" 'slime-fuzzy-complete-symbol)
-  (define-key slime-repl-mode-map "\C-c\M-i" 'slime-fuzzy-complete-symbol))
+  (when (featurep 'slime-repl)
+   (define-key slime-repl-mode-map "\C-c\M-i" 'slime-fuzzy-complete-symbol)))
 
 (provide 'slime-fuzzy)
--- /project/slime/cvsroot/slime/contrib/slime-presentations.el	2010/03/09 14:42:22	1.29
+++ /project/slime/cvsroot/slime/contrib/slime-presentations.el	2010/03/20 08:27:50	1.30
@@ -13,6 +13,9 @@
 ;;   (add-hook 'slime-load-hook (lambda () (require 'slime-presentations)))
 ;;
 
+(unless (featurep 'slime-repl)
+  (error "slime-presentations requires slime-repl contrib"))
+
 (defface slime-repl-output-mouseover-face
   (if (featurep 'xemacs)
       '((t (:bold t)))