From sboukarev at common-lisp.net Thu Apr 14 01:21:11 2011 From: sboukarev at common-lisp.net (CVS User sboukarev) Date: Wed, 13 Apr 2011 21:21:11 -0400 Subject: [slime-cvs] CVS slime Message-ID: Update of /project/slime/cvsroot/slime In directory cl-net:/tmp/cvs-serv28377 Modified Files: ChangeLog swank.lisp Log Message: * swank.lisp (list-threads): Call `use-threads-p' only when *emacs-connection* is non-nil. `use-threads-p' wouldn't work in this case, and there is no need to remove a worker thread from the list if it's not connected. This fixes an issue with calling swank:stop-server when slime isn't connected. --- /project/slime/cvsroot/slime/ChangeLog 2011/03/13 21:11:12 1.2185 +++ /project/slime/cvsroot/slime/ChangeLog 2011/04/14 01:21:10 1.2186 @@ -1,3 +1,12 @@ +2011-04-14 Stas Boukarev + + * swank.lisp (list-threads): Call `use-threads-p' only when + *emacs-connection* is non-nil. `use-threads-p' wouldn't work in + this case, and there is no need to remove a worker thread from the + list if it's not connected. + This fixes an issue with calling swank:stop-server when slime + isn't connected. + 2011-03-13 Stas Boukarev * swank.lisp (format-restarts-for-emacs): Add --- /project/slime/cvsroot/slime/swank.lisp 2011/03/13 21:11:13 1.741 +++ /project/slime/cvsroot/slime/swank.lisp 2011/04/14 01:21:11 1.742 @@ -3761,7 +3761,8 @@ LABELS is a list of attribute names and the remaining lists are the corresponding attribute values per thread." (setq *thread-list* (all-threads)) - (when (and (use-threads-p) + (when (and *emacs-connection* + (use-threads-p) (equalp (thread-name (current-thread)) "worker")) (setf *thread-list* (delete (current-thread) *thread-list*))) (let* ((plist (thread-attributes (car *thread-list*))) From sboukarev at common-lisp.net Sat Apr 16 05:17:59 2011 From: sboukarev at common-lisp.net (CVS User sboukarev) Date: Sat, 16 Apr 2011 01:17:59 -0400 Subject: [slime-cvs] CVS slime Message-ID: Update of /project/slime/cvsroot/slime In directory cl-net:/tmp/cvs-serv4378 Modified Files: ChangeLog slime.el Log Message: * slime.el (slime-load-failed-fasl): New variable. Accepts `ask', `always', and `never' symbols. Loads or not loads fasls produced by compile-file which returned non-nil failure-p. --- /project/slime/cvsroot/slime/ChangeLog 2011/04/14 01:21:10 1.2186 +++ /project/slime/cvsroot/slime/ChangeLog 2011/04/16 05:17:59 1.2187 @@ -1,3 +1,9 @@ +2011-04-16 Stas Boukarev + + * slime.el (slime-load-failed-fasl): New variable. Accepts `ask', + `always', and `never' symbols. Loads or not loads fasls produced by + compile-file which returned non-nil failure-p. + 2011-04-14 Stas Boukarev * swank.lisp (list-threads): Call `use-threads-p' only when --- /project/slime/cvsroot/slime/slime.el 2011/03/09 20:09:57 1.1362 +++ /project/slime/cvsroot/slime/slime.el 2011/04/16 05:17:59 1.1363 @@ -2664,6 +2664,21 @@ ',slime-compilation-policy) #'slime-compilation-finished))) +(defcustom slime-load-failed-fasl 'ask + "Which action to take when COMPILE-FILE set FAILURE-P to T. +NEVER doesn't load the fasl +ALWAYS loads the fasl +ASK asks the user." + :type '(choice (const never) + (const always) + (const ask))) + +(defun slime-load-failed-fasl-p () + (ecase slime-load-failed-fasl + (never nil) + (always t) + (ask (y-or-n-p "Compilation failed. Load fasl file anyway? ")))) + (defun slime-compilation-finished (result) (with-struct (slime-compilation-result. notes duration successp loadp faslfile) result @@ -2675,7 +2690,7 @@ (run-hook-with-args 'slime-compilation-finished-hook notes) (when (and loadp faslfile (or successp - (y-or-n-p "Compilation failed. Load fasl file anyway? "))) + (slime-load-failed-fasl-p))) (slime-eval-async `(swank:load-file ,faslfile))))) (defun slime-show-note-counts (notes secs successp)