[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
	* slime.el (slime-minibuffer-map): Nee `slime-read-expression-map'
	(slime-minibuffer-history): Nee `slime-read-expression-history'
	(slime-minibuffer-setup-hook): Extracted.
	(slime-read-from-minibuffer): Adapted accordingly.

	* slime-asdf.el (slime-query-replace-system): Enable TAB
	completion of symbol names.

	* slime-fuzzy.el (slime-fuzzy-completions): Do not use
	`slime-find-buffer-package' it's an internal operation of
	`slime-current-buffer'.


--- /project/slime/cvsroot/slime/ChangeLog	2009/11/13 20:23:57	1.1917
+++ /project/slime/cvsroot/slime/ChangeLog	2009/11/19 13:37:44	1.1918
@@ -1,3 +1,10 @@
+2009-11-19  Tobias C. Rittweiler <tcr at freebits.de>
+
+	* slime.el (slime-minibuffer-map): Nee `slime-read-expression-map'
+	(slime-minibuffer-history): Nee `slime-read-expression-history'
+	(slime-minibuffer-setup-hook): Extracted.
+	(slime-read-from-minibuffer): Adapted accordingly.
+
 2009-11-13  Stas Boukarev  <stassats at gmail.com>
 
 	* swank.lisp (classify-symbol): Check fbound before calling fdefinition,
--- /project/slime/cvsroot/slime/slime.el	2009/11/05 16:43:05	1.1249
+++ /project/slime/cvsroot/slime/slime.el	2009/11/19 13:37:44	1.1250
@@ -3743,7 +3743,7 @@
             ((memq (char-before) '(?\t ?\ ))
              (slime-echo-arglist))))))
 
-(defvar slime-read-expression-map
+(defvar slime-minibuffer-map
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map minibuffer-local-map)
     (define-key map "\t" 'slime-complete-symbol)
@@ -3751,23 +3751,25 @@
     map)
   "Minibuffer keymap used for reading CL expressions.")
 
-(defvar slime-read-expression-history '()
+(defvar slime-minibuffer-history '()
   "History list of expressions read from the minibuffer.")
  
-(defun slime-read-from-minibuffer (prompt &optional initial-value)
+(defun slime-minibuffer-setup-hook ()
+  (cons (lexical-let ((package (slime-current-package))
+                      (connection (slime-connection)))
+          (lambda ()
+            (setq slime-buffer-package package)
+            (setq slime-buffer-connection connection)
+            (set-syntax-table lisp-mode-syntax-table)))
+        minibuffer-setup-hook))
+
+(defun slime-read-from-minibuffer (prompt &optional initial-value history)
   "Read a string from the minibuffer, prompting with PROMPT.  
 If INITIAL-VALUE is non-nil, it is inserted into the minibuffer before
 reading input.  The result is a string (\"\" if no input was given)."
-  (let ((minibuffer-setup-hook 
-         (cons (lexical-let ((package (slime-current-package))
-                             (connection (slime-connection)))
-                 (lambda ()
-                   (setq slime-buffer-package package)
-                   (setq slime-buffer-connection connection)
-                   (set-syntax-table lisp-mode-syntax-table)))
-	       minibuffer-setup-hook)))
-    (read-from-minibuffer prompt initial-value slime-read-expression-map
-			  nil 'slime-read-expression-history)))
+  (let ((minibuffer-setup-hook (slime-minibuffer-setup-hook)))
+    (read-from-minibuffer prompt initial-value slime-minibuffer-map
+			  nil 'slime-minibuffer-history)))
 
 (defun slime-bogus-completion-alist (list)
   "Make an alist out of list.