← Back to branch summary

~ubuntu-branches/ubuntu/trusty/slime/trusty

« back to all changes in this revision

Viewing changes to swank-corman.lisp

  • Committer: Bazaar Package Importer
  • Author(s): Peter Van Eynde
  • Date: 2006-12-05 10:35:50 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20061205103550-qh2ij11czkh5x7ns
Tags: 1:20061201-2
Fix stupid merge error that I missed. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
swank-corman.lisp
239
239
 
240
240
(defimplementation accept-connection (socket
241
241
                                      &key external-format buffering timeout)
242
 
  (declare (ignore buffering timeout))
243
 
  (ecase (or external-format :iso-latin-1-unix)
244
 
    (:iso-latin-1-unix 
245
 
     (sockets:make-socket-stream (sockets:accept-socket socket)))))
 
242
  (declare (ignore buffering timeout external-format))
 
243
  (sockets:make-socket-stream (sockets:accept-socket socket)))
246
244
 
247
245
;;; Misc
248
246
 
367
365
    (funcall fn)))
368
366
 
369
367
(defimplementation swank-compile-file (*compile-filename* load-p
370
 
                                       &optional external-format)
 
368
                                       external-format)
371
369
  (declare (ignore external-format))
372
370
  (with-compilation-hooks ()
373
371
    (let ((*buffer-name* nil))