[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog README slime.el 
Log Message:
* slime.el (slime-inspector-buffer): Use slime-with-popup-buffer,
that solves the problem with keybindings shadowed by slime-mode.
Reported by Nathan Bird.

* README: Better wording.


--- /project/slime/cvsroot/slime/ChangeLog	2010/04/22 05:47:35	1.2074
+++ /project/slime/cvsroot/slime/ChangeLog	2010/04/23 02:46:27	1.2075
@@ -1,3 +1,11 @@
+2010-04-23  Stas Boukarev  <stassats at gmail.com>
+
+	* slime.el (slime-inspector-buffer): Use slime-with-popup-buffer,
+	that solves the problem with keybindings shadowed by slime-mode.
+	Reported by Nathan Bird.
+
+	* README: Better wording.
+
 2010-04-22  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-backend.lisp (with-symbol): Test for package before doing
--- /project/slime/cvsroot/slime/README	2010/04/20 02:25:23	1.15
+++ /project/slime/cvsroot/slime/README	2010/04/23 02:46:28	1.16
@@ -20,10 +20,13 @@
   Make sure your `inferior-lisp-program' is set to a compatible
   version of Lisp.
 
-  slime-setup command is used also to load additional contribs, most often used
-  meta-contrib is slime-fancy, it include a better REPL, and many more nice features,
-  to load it change (slime-setup) form above to (slime-setup '(slime-fancy))
-  
+  The function `slime-setup' can also load additional, contributed
+  packages ("contribs"). The most-often used package is
+  slime-fancy.el, which primarily installs a popular set of other
+  contributed packages. It includes a better REPL, and many more nice
+  features. To load it, change the bare (slime-setup) form above to
+  (slime-setup '(slime-fancy)).
+
   Use `M-x' slime to fire up and connect to an inferior Lisp.
   SLIME will now automatically be available in your Lisp source
   buffers.
--- /project/slime/cvsroot/slime/slime.el	2010/04/21 08:54:11	1.1305
+++ /project/slime/cvsroot/slime/slime.el	2010/04/23 02:46:28	1.1306
@@ -6497,21 +6497,24 @@
 				     (slime-sexp-at-point))))
   (slime-eval-async `(swank:init-inspector ,string) 'slime-open-inspector))
 
-(define-derived-mode slime-inspector-mode fundamental-mode "Slime-Inspector"
+(define-derived-mode slime-inspector-mode fundamental-mode
+  "Slime-Inspector"
+  "
+\\{slime-inspector-mode-map}
+\\{slime-popup-buffer-mode-map}"
   (set-syntax-table lisp-mode-syntax-table)
   (slime-set-truncate-lines)
   (setq buffer-read-only t))
 
 (defun slime-inspector-buffer ()
   (or (get-buffer "*Slime Inspector*")
-      (with-current-buffer (get-buffer-create "*Slime Inspector*")
-	(setq slime-inspector-mark-stack '())
-	(slime-inspector-mode)
-        (slime-mode t)
+      (slime-with-popup-buffer ("*Slime Inspector*" :mode 'slime-inspector-mode)
+        (setq slime-inspector-mark-stack '())
         (buffer-disable-undo)
         (make-local-variable 'slime-saved-window-config)
+        (setq slime-popup-buffer-quit-function 'slime-inspector-quit)
         (setq slime-saved-window-config (current-window-configuration))
-	(current-buffer))))
+        (current-buffer))))
 
 (defmacro slime-inspector-fontify (face string)
   `(slime-add-face ',(intern (format "slime-inspector-%s-face" face)) ,string))
@@ -6655,12 +6658,12 @@
 	  (t (message "No next object")
 	     (ding)))))
   
-(defun slime-inspector-quit ()
+(defun slime-inspector-quit (&optional kill-buffer)
   "Quit the inspector and kill the buffer."
   (interactive)
   (slime-eval-async `(swank:quit-inspector))
   (set-window-configuration slime-saved-window-config)
-  (kill-buffer (current-buffer)))
+  (slime-popup-buffer-quit t))
 
 ;; FIXME: first return value is just point.
 ;; FIXME: could probably use slime-search-property.
@@ -6833,7 +6836,6 @@
   ("p" 'slime-inspector-pprint)
   ("e" 'slime-inspector-eval)
   ("h" 'slime-inspector-history)
-  ("q" 'slime-inspector-quit)
   ("g" 'slime-inspector-reinspect)
   ("v" 'slime-inspector-toggle-verbose)
   ("\C-i" 'slime-inspector-next-inspectable-object)