From sboukarev at common-lisp.net  Tue Jun 12 09:25:31 2012
From: sboukarev at common-lisp.net (CVS User sboukarev)
Date: Tue, 12 Jun 2012 02:25:31 -0700
Subject: [slime-cvs] CVS slime
Message-ID: <E1SeNLv-0003C5-C6@common-lisp.net>

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-changelog-date): Use
(expand-file-name "ChangeLog" slime-path) instead of
(concat slime-path "ChangeLog"), slime-path may not have a
trailing /.
Reported by Paul Sexton (lp#1011935).


--- /project/slime/cvsroot/slime/ChangeLog	2012/05/25 01:25:05	1.2342
+++ /project/slime/cvsroot/slime/ChangeLog	2012/06/12 09:25:30	1.2343
@@ -1,3 +1,11 @@
+2012-06-12  Stas Boukarev  <stassats at gmail.com>
+
+	* slime.el (slime-changelog-date): Use
+	(expand-file-name "ChangeLog" slime-path) instead of
+	(concat slime-path "ChangeLog"), slime-path may not have a
+	trailing /.
+	Reported by Paul Sexton (lp#1011935).
+
 2012-05-25  Stas Boukarev  <stassats at gmail.com>
 
 	* slime.el (slime-oneliner): Use minibuffer width instead of the
--- /project/slime/cvsroot/slime/slime.el	2012/05/25 01:25:06	1.1409
+++ /project/slime/cvsroot/slime/slime.el	2012/06/12 09:25:30	1.1410
@@ -119,7 +119,7 @@
     "Return the datestring of the latest entry in the ChangeLog file.
 Return nil if the ChangeLog file cannot be found."
     (interactive "p")
-    (let ((changelog (concat slime-path "ChangeLog"))
+    (let ((changelog (expand-file-name "ChangeLog" slime-path))
           (date nil))
       (when (file-exists-p changelog)
         (with-temp-buffer 




From heller at common-lisp.net  Tue Jun 19 19:46:54 2012
From: heller at common-lisp.net (CVS User heller)
Date: Tue, 19 Jun 2012 12:46:54 -0700
Subject: [slime-cvs] CVS slime
Message-ID: <E1Sh4O6-0004Nr-15@common-lisp.net>

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

Modified Files:
	ChangeLog swank-ecl.lisp 
Log Message:
* swank-ecl.lisp (wait-for-input): Provide implementation
that doesn't need serve-event.

--- /project/slime/cvsroot/slime/ChangeLog	2012/06/12 09:25:30	1.2343
+++ /project/slime/cvsroot/slime/ChangeLog	2012/06/19 19:46:53	1.2344
@@ -1,3 +1,8 @@
+2012-06-19  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-ecl.lisp (wait-for-input): Provide implementation
+	that doesn't need serve-event.
+
 2012-06-12  Stas Boukarev  <stassats at gmail.com>
 
 	* slime.el (slime-changelog-date): Use
--- /project/slime/cvsroot/slime/swank-ecl.lisp	2012/04/20 21:58:18	1.75
+++ /project/slime/cvsroot/slime/swank-ecl.lisp	2012/06/19 19:46:53	1.76
@@ -203,6 +203,17 @@
 
 ) ; #+serve-event (progn ...
 
+#-serve-event
+(defimplementation wait-for-input (streams &optional timeout)
+  (assert (member timeout '(nil t)))
+  (loop
+   (cond ((check-slime-interrupts) (return :interrupt))
+         (timeout (return (remove-if-not #'listen streams)))
+         (t
+          (let ((ready (remove-if-not #'listen streams)))
+            (if ready (return ready))
+            (sleep 0.1))))))
+
 
 ;;;; Compilation