[slime-cvs] CVS slime/contrib
CVS User trittweiler
trittweiler at common-lisp.net
Mon Feb 15 21:42:37 UTC 2010
Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv3073/contrib
Modified Files:
ChangeLog slime-asdf.el slime-autodoc.el slime-c-p-c.el
slime-clipboard.el slime-fancy-inspector.el slime-fuzzy.el
slime-indentation.el slime-motd.el
slime-presentation-streams.el slime-presentations.el
slime-sbcl-exts.el slime-snapshot.el slime-sprof.el
Log Message:
* slime.el (slime-load-contribs): Do not call SWANK-REQUIRE
asynchronously, if host Lisp uses :SPAWN that may result in the
attempt to load in code concurrently -- the host Lisp may not
support that.
* slime-asdf.el, slime-autodoc.el, slime-c-p-c.el,
slime-clipboard.el, slime-fancy-inspector.el, slime-fuzzy,el,
slime-indentation.el, slime-motd.el,
slime-presentation-streams.el, slime-presentations.el,
slime-sbcl-exts, slime-snapshot.el, slime-sprof.el:
Make sure that contrib code does not try to load in swank code
asynchronously but use `slime-require' instead; also make sure to
move the `slime-require' into the contribs' init function.
--- /project/slime/cvsroot/slime/contrib/ChangeLog 2010/01/31 20:17:27 1.342
+++ /project/slime/cvsroot/slime/contrib/ChangeLog 2010/02/15 21:42:37 1.343
@@ -1,3 +1,15 @@
+2010-02-15 Tobias C. Rittweiler <tcr at freebits.de>
+
+ * slime-asdf.el, slime-autodoc.el, slime-c-p-c.el,
+ slime-clipboard.el, slime-fancy-inspector.el, slime-fuzzy,el,
+ slime-indentation.el, slime-motd.el,
+ slime-presentation-streams.el, slime-presentations.el,
+ slime-sbcl-exts, slime-snapshot.el, slime-sprof.el:
+
+ Make sure that contrib code does not try to load in swank code
+ asynchronously but use `slime-require' instead; also make sure to
+ move the `slime-require' into the contribs' init function.
+
2010-01-31 Stas Boukarev <stassats at gmail.com>
* slime-repl.el (slime-repl-mode): Don't do
--- /project/slime/cvsroot/slime/contrib/slime-asdf.el 2010/01/05 19:58:57 1.27
+++ /project/slime/cvsroot/slime/contrib/slime-asdf.el 2010/02/15 21:42:37 1.28
@@ -287,11 +287,8 @@
;;; Initialization
-(defun slime-asdf-on-connect ()
- (slime-eval-async '(swank:swank-require :swank-asdf)))
-
(defun slime-asdf-init ()
- (add-hook 'slime-connected-hook 'slime-asdf-on-connect)
+ (slime-require :swank-asdf)
(add-to-list 'slime-edit-uses-xrefs :depends-on t)
(define-key slime-who-map [?d] 'slime-who-depends-on))
--- /project/slime/cvsroot/slime/contrib/slime-autodoc.el 2010/01/06 18:23:44 1.34
+++ /project/slime/cvsroot/slime/contrib/slime-autodoc.el 2010/02/15 21:42:37 1.35
@@ -215,6 +215,7 @@
;;;; Initialization
(defun slime-autodoc-init ()
+ (slime-require :swank-arglists)
(dolist (h '(slime-mode-hook slime-repl-mode-hook sldb-mode-hook))
(add-hook h 'slime-autodoc-maybe-enable)))
@@ -233,8 +234,6 @@
(dolist (h '(slime-mode-hook slime-repl-mode-hook sldb-mode-hook))
(remove-hook h 'slime-autodoc-maybe-enable)))
-(slime-require :swank-arglists)
-
;;;; Test cases
(defun slime-check-autodoc-at-point (arglist)
--- /project/slime/cvsroot/slime/contrib/slime-c-p-c.el 2009/12/30 10:30:13 1.20
+++ /project/slime/cvsroot/slime/contrib/slime-c-p-c.el 2010/02/15 21:42:37 1.21
@@ -170,6 +170,7 @@
(defvar slime-c-p-c-init-undo-stack nil)
(defun slime-c-p-c-init ()
+ (slime-require :swank-c-p-c)
;; save current state for unload
(push
`(progn
--- /project/slime/cvsroot/slime/contrib/slime-clipboard.el 2008/08/12 17:54:30 1.2
+++ /project/slime/cvsroot/slime/contrib/slime-clipboard.el 2010/02/15 21:42:37 1.3
@@ -17,7 +17,6 @@
;;
(require 'slime)
-(slime-require :swank-clipboard)
(define-derived-mode slime-clipboard-mode fundamental-mode
"Slime-Clipboard"
@@ -166,4 +165,7 @@
`(:sldb ,(sldb-frame-number-at-point)
,(sldb-var-number-at-point))))
+(defun slime-clipboard-init ()
+ (slime-require :swank-clipboard))
+
(provide 'slime-clipboard)
--- /project/slime/cvsroot/slime/contrib/slime-fancy-inspector.el 2008/02/10 08:31:21 1.3
+++ /project/slime/cvsroot/slime/contrib/slime-fancy-inspector.el 2010/02/15 21:42:37 1.4
@@ -4,6 +4,7 @@
;; License: GNU GPL (same license as Emacs)
;;
-(slime-require :swank-fancy-inspector)
+(defun slime-fancy-inspector-init ()
+ (slime-require :swank-fancy-inspector))
(provide 'slime-fancy-inspector)
\ No newline at end of file
--- /project/slime/cvsroot/slime/contrib/slime-fuzzy.el 2009/12/11 06:35:20 1.14
+++ /project/slime/cvsroot/slime/contrib/slime-fuzzy.el 2010/02/15 21:42:37 1.15
@@ -593,12 +593,11 @@
;;; Initialization
(defun slime-fuzzy-init ()
- (slime-fuzzy-bind-keys))
+ (slime-fuzzy-bind-keys)
+ (slime-require :swank-fuzzy))
(defun slime-fuzzy-bind-keys ()
(define-key slime-mode-map "\C-c\M-i" 'slime-fuzzy-complete-symbol)
(define-key slime-repl-mode-map "\C-c\M-i" 'slime-fuzzy-complete-symbol))
-(slime-require :swank-fuzzy)
-
(provide 'slime-fuzzy)
--- /project/slime/cvsroot/slime/contrib/slime-indentation.el 2008/08/20 11:42:47 1.3
+++ /project/slime/cvsroot/slime/contrib/slime-indentation.el 2010/02/15 21:42:37 1.4
@@ -1,10 +1,7 @@
;;;; slime-indentation.el - cl-indent.el as a slime-contrib module
-(defun slime-indentation-install ()
- (slime-eval-async '(swank:swank-require :swank-indentation)))
-
(defun slime-indentation-init ()
- (add-hook 'slime-connected-hook 'slime-indentation-install))
+ (slime-require :swank-indentation))
;; redefine this for cl-indent:method
(defun slime-handle-indentation-update (alist)
--- /project/slime/cvsroot/slime/contrib/slime-motd.el 2008/02/03 18:39:23 1.1
+++ /project/slime/cvsroot/slime/contrib/slime-motd.el 2010/02/15 21:42:37 1.2
@@ -11,19 +11,18 @@
(require 'slime-banner)
(defcustom slime-motd-pathname nil
- "The local pathnamethe motd is read from."
+ "The local pathname the motd is read from."
:group 'slime-mode
:type '(file :must-match t))
(defun slime-insert-motd ()
- (slime-eval-async `(cl:progn
- (swank:swank-require :swank-motd)
- (swank::read-motd ,slime-motd-pathname))
+ (slime-eval-async `(swank::read-motd ,slime-motd-pathname)
(lambda (motd)
(when motd
(slime-repl-insert-result (list :values motd))))))
(defun slime-motd-init ()
+ (swank:swank-require :swank-motd)
(add-hook 'slime-connected-hook 'slime-insert-motd))
(provide 'slime-motd)
--- /project/slime/cvsroot/slime/contrib/slime-presentation-streams.el 2007/08/28 08:25:12 1.2
+++ /project/slime/cvsroot/slime/contrib/slime-presentation-streams.el 2010/02/15 21:42:37 1.3
@@ -20,10 +20,8 @@
(require 'slime-presentations)
-(add-hook 'slime-connected-hook 'slime-install-presentation-streams)
-
-(defun slime-install-presentation-streams ()
- (slime-eval-async '(swank:swank-require :swank-presentation-streams)))
+(defun slime-presentation-streams-init ()
+ (slime-require :swank-presentation-streams))
(provide 'slime-presentation-streams)
--- /project/slime/cvsroot/slime/contrib/slime-presentations.el 2009/12/12 18:43:04 1.27
+++ /project/slime/cvsroot/slime/contrib/slime-presentations.el 2010/02/15 21:42:37 1.28
@@ -761,12 +761,11 @@
(with-current-buffer (slime-output-buffer)
(let ((marker (slime-output-target-marker target)))
(goto-char marker)
- (let ((result-start (point)))
- (slime-propertize-region `(face slime-repl-result-face
- rear-nonsticky (face))
- (insert string))
- ;; Move the input-start marker after the REPL result.
- (set-marker marker (point))))))
+ (slime-propertize-region `(face slime-repl-result-face
+ rear-nonsticky (face))
+ (insert string))
+ ;; Move the input-start marker after the REPL result.
+ (set-marker marker (point)))))
(t
(let* ((marker (slime-output-target-marker target))
(buffer (and marker (marker-buffer marker))))
@@ -843,6 +842,7 @@
;;; Initialization
(defun slime-presentations-init ()
+ (slime-require :swank-presentations)
(add-hook 'slime-repl-mode-hook
(lambda ()
;; Respect the syntax text properties of presentation.
@@ -855,7 +855,6 @@
(add-hook 'slime-repl-current-input-hooks 'slime-presentation-current-input)
(add-hook 'slime-open-stream-hooks 'slime-presentation-on-stream-open)
(add-hook 'slime-repl-clear-buffer-hook 'slime-clear-presentations)
- (add-hook 'slime-connected-hook 'slime-install-presentations)
(add-hook 'slime-edit-definition-hooks 'slime-edit-presentation)
(setq slime-inspector-insert-ispec-function 'slime-presentation-inspector-insert-ispec)
(setq sldb-insert-frame-variable-value-function
@@ -863,9 +862,4 @@
(slime-presentation-init-keymaps)
(slime-presentation-add-easy-menu))
-(defun slime-install-presentations ()
- (slime-eval-async '(swank:swank-require :swank-presentations)))
-
-(slime-presentations-init)
-
(provide 'slime-presentations)
--- /project/slime/cvsroot/slime/contrib/slime-sbcl-exts.el 2009/12/21 16:03:41 1.4
+++ /project/slime/cvsroot/slime/contrib/slime-sbcl-exts.el 2010/02/15 21:42:37 1.5
@@ -30,8 +30,7 @@
(browse-url (format "http://bugs.launchpad.net/sbcl/+bug/%s"
(substring bug 1))))
-(defun slime-sbcl-exts-init ())
-
-(slime-require :swank-sbcl-exts)
+(defun slime-sbcl-exts-init ()
+ (slime-require :swank-sbcl-exts))
(provide 'slime-sbcl-exts)
\ No newline at end of file
--- /project/slime/cvsroot/slime/contrib/slime-snapshot.el 2009/12/22 09:31:15 1.1
+++ /project/slime/cvsroot/slime/contrib/slime-snapshot.el 2010/02/15 21:42:37 1.2
@@ -1,7 +1,5 @@
;; slime-snapshot.el --- Save&restore memory images without disconnecting
-(slime-require :swank-snapshot)
-
(defun slime-snapshot (filename)
"Save a memory image to the file FILENAME."
(interactive (list (read-file-name "Image file: ")))
@@ -16,3 +14,6 @@
,(expand-file-name filename))
nil t nil)
(slime-connection)))
+
+(defun slime-snapshot-init ()
+ (slime-require :swank-snapshot))
\ No newline at end of file
--- /project/slime/cvsroot/slime/contrib/slime-sprof.el 2009/10/14 17:29:15 1.4
+++ /project/slime/cvsroot/slime/contrib/slime-sprof.el 2010/02/15 21:42:37 1.5
@@ -10,8 +10,6 @@
;;
;; (slime-setup '(... slime-sprof))
-(slime-require :swank-sprof)
-
(defvar slime-sprof-exclude-swank nil
"*Display swank functions in the report.")
@@ -217,6 +215,7 @@
;;; Menu
(defun slime-sprof-init ()
+ (slime-require :swank-sprof)
(let ((C '(and (slime-connected-p)
(equal (slime-lisp-implementation-type) "SBCL"))))
(setf (cdr (last (assoc "Profiling" slime-easy-menu)))
More information about the slime-cvs
mailing list