Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.28 warnings fix #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions contrib/slime-repl.el
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,8 @@ expansion will be added to the REPL's history.)"

(defun slime-repl-event-hook-function (event)
(slime-dcase event
((:write-string output &optional target thread)
((:write-string output &optional target)
(slime-write-string output target)
(when thread
(slime-send `(:write-done ,thread)))
t)
((:read-string thread tag)
(cl-assert thread)
Expand Down
6 changes: 1 addition & 5 deletions contrib/swank-repl.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@ DEDICATED-OUTPUT INPUT OUTPUT IO REPL-RESULTS"
"Create function to send user output to Emacs."
(lambda (string)
(with-connection (connection)
(send-to-emacs `(:write-string ,string nil ,(current-thread-id)))
;; Wait for Emacs to finish writing, otherwise on continuous
;; output its input buffer will fill up and nothing else will be
;; processed, most importantly an interrupt-thread request.
(wait-for-event `(:write-done)))))
(send-to-emacs `(:write-string ,string)))))

(defun open-dedicated-output-stream (connection coding-system)
"Open a dedicated output connection to the Emacs on SOCKET-IO.
Expand Down
3 changes: 1 addition & 2 deletions swank.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,7 @@ The processing is done in the extent of the toplevel restart."
&rest _)
(declare (ignore _))
(encode-message event (current-socket-io)))
(((:emacs-pong :emacs-return :emacs-return-string :ed-rpc-forbidden
:write-done)
(((:emacs-pong :emacs-return :emacs-return-string :ed-rpc-forbidden)
thread-id &rest args)
(send-event (find-thread thread-id) (cons (car event) args)))
((:emacs-channel-send channel-id msg)
Expand Down
4 changes: 3 additions & 1 deletion swank/gray.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@

(in-package swank/gray)

(defconstant +string-maximum+ 64000)

(defclass slime-output-stream (fundamental-character-output-stream)
((output-fn :initarg :output-fn)
(buffer :initform (make-string 64000))
(buffer :initform (make-string +string-maximum+))
(fill-pointer :initform 0)
(column :initform 0)
(lock :initform (make-lock :name "buffer write lock"))
Expand Down