[slime-cvs] CVS update: slime/slime.el slime/swank.lisp

[Helmut Eller]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv2125

Modified Files:
	slime.el swank.lisp 
Log Message:
Duh!  I'd better run the test suite _before_ committing.

Date: Mon Nov  3 19:03:49 2003
Author: heller

Index: slime/slime.el
diff -u slime/slime.el:1.75 slime/slime.el:1.76
--- slime/slime.el:1.75	Mon Nov  3 18:19:07 2003
+++ slime/slime.el	Mon Nov  3 19:03:48 2003
@@ -482,6 +482,15 @@
   (let ((same-window-buffer-names nil))
     (display-buffer buffer not-this-window)))
 
+(defun slime-create-message-window ()
+  (let ((previous (previous-window (minibuffer-window))))
+    (when (<= (window-height previous) (* 2 window-min-height))
+      (save-selected-window 
+        (select-window previous)
+        (enlarge-window (- (1+ (* 2 window-min-height))
+                           (window-height previous)))))
+    (split-window previous)))
+  
 (defun slime-display-message-or-view (msg bufname &optional select)
   "Like `display-buffer-or-message', but with `view-buffer-other-window'.
 That is, if a buffer pops up it will be in view mode, and pressing q
@@ -490,6 +499,7 @@
 Only uses the echo area for single-line messages - or more accurately,
 messages without embedded newlines. They may still need to wrap or
 truncate to fit on the screen."
+  (when (get-buffer-window bufname) (delete-windows-on bufname))
   (if (or (string-match "\n.*[^\\s-]" msg)
           (> (length msg) (1- (frame-width))))
       ;; Contains a newline with actual text after it, so display as a
@@ -500,7 +510,7 @@
 	  (erase-buffer)
 	  (insert msg)
 	  (goto-char (point-min))
-          (let ((win (split-window (previous-window (minibuffer-window)))))
+          (let ((win (slime-create-message-window)))
             (set-window-buffer win (current-buffer))
             (slime-display-buffer-region (current-buffer) 
                                          (point-min) (point-max))
@@ -508,7 +518,6 @@
                 (select-window win)
               (add-hook (make-local-variable 'pre-command-hook)
                         'slime-remove-message-window)))))
-    (when (get-buffer-window bufname) (delete-windows-on bufname))
     ;; Print only the part before the newline (if there is
     ;; one). Newlines in messages are displayed as "^J" in emacs20,
     ;; which is ugly


Index: slime/swank.lisp
diff -u slime/swank.lisp:1.53 slime/swank.lisp:1.54
--- slime/swank.lisp:1.53	Mon Nov  3 18:20:20 2003
+++ slime/swank.lisp	Mon Nov  3 19:03:48 2003
@@ -396,12 +396,13 @@
   PKG:FOO  - Symbols with matching prefix and external in package PKG.
   PKG::FOO - Symbols with matching prefix and accessible in package PKG."
   (multiple-value-bind (name package-name internal-p)
-      (parse-symbol-designator (case-convert string))
+      (parse-symbol-designator string)
     (let ((completions nil)
           (package (find-package 
-                    (cond ((equal package-name "") "KEYWORD")
-                          (package-name)
-                          (default-package-name)))))
+                    (case-convert
+                     (cond ((equal package-name "") "KEYWORD")
+                           (package-name)
+                           (default-package-name))))))
       (flet ((symbol-matches-p (symbol)
                (and (string-prefix-p name (symbol-name symbol))
                     (or (or internal-p (null package-name))