* sly-mrepl.el (sly-mrepl-return): Fix some indentation buggyness.
(inferior-sly): Don't require 'inferior-sly.
(sly-mrepl-mode): More reable setting of local variables.
(sly-mrepl--send-input): New function.

* contrib/swank-arglists.lisp (extra-keywords): New method spec for
symbols. Allow libs to specify extra keywords for macros using
:SWANK-EXTRA-KEYWORDS and :SWANK-ALLOW-OTHER-KEYWORDS symbol
props.

* contrib/sly-clipboard.el: Require `cl-lib'/`cl' for `lexical-let' and `cl-'
prefix.
(sly-clipboard-insert-entries, sly-clipboard-insert-ref)
(sly-clipboard-ref-modified): Use `cl-' prefix.

(cherry picked from SLIME commit
080caca5)

Conflicts:
	contrib/ChangeLog
	contrib/slime-clipboard.el

* .travis.yml (env): Don't overtest on Emacs 23, as per comment.
(install): No need for trailing semicolon.

* sly-tests.el (compile-defun-with-reader-conditionals): Renamed
from `compile-defun-with-reader-characters'. Break long lines.

(cherry picked from SLIME commit
8689f401)

Conflicts:
	.travis.yml
	ChangeLog

* sly-tests.el (compile-defun): Test split into two parts.
(compile-defun-with-reader-characters): Split from `compile-defun'
as CCL does not pass this part.
* .travis.yml: added targets to include CCL 1.9 for Travis builds
* contrib/test/sly-autodoc-tests.el: Mark several tests as failing for
CCL 1.9

(cherry picked from SLIME commit
0e3508a5)

Conflicts:
	.travis.yml
	ChangeLog
	contrib/ChangeLog
	sly-tests.el

* metering.lisp ("SWANK-MONITOR"): Enter SWANK-MONITOR package.

(cherry picked from SLIME commit
1f57e1ea)

Conflicts:
	ChangeLog

Using nicknames, especially short terse ones, are more likely
to create package name conflicts with othe packages.  Since
swank is widely used, its better to avoid using nicknames (or
at least short ones).  All package nicknames removed.

Further, the "MONITOR" package has been renamed
"SWANK-MONITOR" for the same reason: without the extra
qualification, the name could conflict with other packages.

* contrib/swank-trace-dialog.lisp (defpackage swank-trace-dialog):
  removed :STD nickname

* metering.lisp (defpackage "MONITOR"): removed :MON nickname,
touched up references in comments

* swank-ccl.lisp (profile, profiled-functions, unprofile)
(unprofile-all, profile-report, profile-reset,profile-package):
replaced use of nickname MON with new package name SWANK-MONITOR

* swank-clisp.lisp: idem

(cherry picked from SLIME commit
1bdbdda7)

Conflicts:
	ChangeLog
	contrib/swank-trace-dialog.lisp

Similar to SLIME commit f503ec19

* sly.el (sly-trim-whitespace): Better implementation, works for
multiline strings.

* sly-old-repl.el (sly-repl-add-to-input-history): Call `sly-trim-whitespace'

(cherry picked from SLIME commit
bf18df32)

Conflicts:
	ChangeLog

(cherry picked from SLIME commit
de847d46)

Conflicts:
	ChangeLog

* sly.el (sly-describe-function): Be a little more precise and
prompt for a symbol naming a function.

(cherry picked from SLIME commit
af4d0b84)

Conflicts:
	ChangeLog
	sly.el

* contrib/sly-trace-dialog.el (sly-trace-dialog--insert-trace): Set
trace entry's marker-insertion-type to T to avoid text later being
inserted before the marker from entering its protected region.

(cherry picked from SLIME commit
3d7e985d)

Conflicts:
	contrib/ChangeLog
	contrib/sly-trace-dialog.el

* sly.el (sly-init-command): Use `sly-to-lisp-filename'.

(cherry picked from SLIME commit
fdcaa1a7)

Conflicts:
	ChangeLog

The previous technique for setting *, ** and friends just-in-time
didn't work, especially when the inspector was called from the REPL
buffer to inspect *.

* contrib/swank-repl.lisp (set-repl-variables): New slyfun.
(repl-eval): Call SET-REPL-VARIABLES *after* evaluating region.

(cherry picked from SLIME commit
af64d8b6)

Conflicts:
	contrib/ChangeLog
	contrib/slime-repl.el
	contrib/swank-repl.lisp

Previous changes broke compilation for definitions in buffers that
don't have files(like *slime-scratch*). Finding definitions in buffers
that have a file name that doens't exist in the file-system was also
broken.

Also WHO-CALLS functionality for top-level forms is unreliable in ACL,
be it for temp or other loading mechanisms. For the former, note
*TEMP-FILE-MAP* might point to dead buffers and for the latter, there
is not enough file info in the .fasl annotations. See
http://franz.com/support/documentation/ \
current/doc/cross-reference.htm#in-functions-arg-2.

Therefore, this change also deletes the previous attempt by
FSPEC-DEFINITION-LOCATIONS to reliably follow :TOP-LEVEL-FORM
references..

* swank-allegro.lisp (fspec-definition-locations): Don't attempt
to interpret :TOP-LEVEL-FORM fspecs, since file info is always
unreliable.

* swank-allegro.lisp (compile-from-temp-file): Reinstate recording
in *TEMP-FILE-MAP* for all compilations. It is still useful if we
haven't saved the buffer or are operating from a file-less buffer,
like *slime-scratch*

(cherry picked from commit 6b357782)

Conflicts:
	ChangeLog

* swank-allegro.lisp (write-tracking-preamble): New function,
rewritten from previous hunk in COMPILE-FROM-TEMP-FILE for
clarity.  Also adds PATHNAME call which broke the previous
approach.
(compile-from-temp-file): In Allegro 9.0, make redefinition
warnings trigger only once now that compilation and loading from
temp files are separate steps.

(cherry picked from SLIME commit
63cae7e1)

Conflicts:
	ChangeLog

Finding definitions compiled with SWANK:SWANK-COMPILE-STRING
relied on a hash table mapping temporary file names to buffer
names, which broke when the original buffer was closed. A new
approach imitate's Franz's own ELI/LEP's and writes a preamble to
each temp file that sets the correct values for
EXCL::*SOURCE-PATHNAME* and *EXCL::*PARTIAL-SOURCE-FILE-P*
pointing to the correct spot in the original file.

For strings compiled in buffers with no file name, the previous
temp-file-to-buffer mapping is kept.

* swank-allegro.lisp (compile-from-temp-file): Use same technique
as ELI to store source pathname and position when compiling from
file buffers.  Don't store buffer mapping for file buffers.  Don't
prevent redefinition warnings for different source pathnames.
(buffer-or-file, find-fspec-location) Don't use buffer mapping for
file buffers.

(cherry picked from SLIME commit
b0fa0dc8)

Conflicts:
	ChangeLog

(cherry picked from SLIME commit
821d0326)

* Makefile (test): New target.

(cherry picked from SLIME commit
4203b5f3)

Conflicts:
	ChangeLog
	Makefile

* Makefile (check): Use ' instead of " to avoid some of the
bizarre shell quoting rules.  Don't evaluate SELECTOR.
(SELECTOR): Extra quoting no longer needed.

(cherry picked from SLIME commit
1dbd0bd8)

Conflicts:
	ChangeLog
	Makefile

* sly.el (sly-complete-restore-window-configuration): Don't
use a timer.  That was only needed for XEmacs and it was
accidentally started multiple times.

(cherry picked from SLIME commit 4fff7fa1)

Conflicts:
	ChangeLog
	sly.el

(cherry picked from SLIME commit 2c8e6a65)

Conflicts:
	ChangeLog
	sly-tests.el

This behavious was lost after the refactorings of
`slime-with-popup-buffer'.

* sly.el (sly-recenter): New function.  (sldb-show-frame-details,
sldb-setup): Use `sly-recenter'.

(cherry picked from SLIME commit
9e5520cf)

Conflicts:
	ChangeLog
	sly.el

This behavious was lost after the refactorings of
`slime-with-popup-buffer'.

* slime.el (slime-popup-buffer-mode): A SLIME popup buffer is
always read-only.

(cherry picked from SLIME commit
c8b595b2)

Conflicts:
	ChangeLog

* swank-allegro.lisp (swank-compile-string): Don't bind
*default-pathname-defaults*.

(cherry picked from SLIME commit
fc001b63)

Conflicts:
	ChangeLog

Still a little broken when called from an error that just happened in
the REPL itself.

* contrib/sly-mrepl.el (sly-mrepl--eval-for-repl): Accept new argument
`out-of-band' to eval in channel but in caller's thread.
(sldb-copy-down-to-repl): Pass `out-of-band' to
`sly-mrepl--eval-for-repl'.

* contrib/swank-mrepl.lisp (:compile-toplevel): Import FIND-CHANNEL.
(eval-in-mrepl): New function.

* contrib/sly-mrepl.el (sly-mrepl-mode, sly-mrepl--insert-output): Make
prompt read-only but inhibit when inserting output.

* sly.el (sly-mode-map): Don't rebind `M-t'

* contrib/sly-mrepl.el (sly-mrepl-new): Don't insert prompt here.
(sly-mrepl--prompt): deleted.
(:prompt): insert prompt here, but check if output is waiting to
arrive.
(sly-mrepl--prompt): Take prompt argument again.
(:evaluation-aborted): Don't insert prompt here.

* contrib/swank-mrepl.lisp (drop-unprocessed-events): Send prompt within
channel bindings.
(mrepl-eval): Reorganize to always send prompt.
(read-eval): Don't print (renamed from READ-EVAL-PRINT)

* sly.el (sldb-local-value-face): Make consistent with inspector.
(sldb--display-in-prev-sldb-window): Remember to call
`display-buffer-record-window'.

* contrib/sly-mrepl.el (sly-mrepl-mode): Set comint.el's history-related
variables.
(sly-mrepl-new): Read input ring from file.
(sly-mrepl--merge-and-save-history): New function.
(sly-mrepl--teardown): Call
`sly-mrepl--merge-and-save-history'. Try to be nicer when errors
happen.

* contrib/swank-mrepl.lisp (mrepl-eval): Removed prompt optimization.
(mrepl-eval): Replace HANDLER-CASE with HANDLER-BIND, otherwise
errors never pop to user.
(send-prompt): Always send *PACKAGE*.

* contrib/sly-mrepl.el: Fix top doc.
(sly-mrepl): Don't list license and authord in contrib def.
(sly-mrepl--prompt): `accept-process-output' here.
(:write-values): Not here.
(:evaluation-aborted): Print condition.

* contrib/swank-mrepl.lisp (listener-channel): Remove DEDICATED slot, add
IN and OUT.
(initialize-instance): Make IN and OUT here, possibly blocking
while waiting for Emacs to connect to OUT.
(create-mrepl): Don't open DEDICATED here.
(mrepl-eval): Use HANDLER-CASE to catch errors. Always flush
streams.
(flush-streams): New function.
(send-prompt): Just send prompt.

* contrib/sly-mrepl.el (sly-mrepl--output-mark)
(sly-mrepl--dedicated-stream): New vars.
(sly-mrepl-mode): Place `sly-mrepl--output-mark' and set its
"stay" insertion type.
(sly-mrepl--insert-output): New function just for inserting
output.
(sly-mrepl--prompt): Set `sly-mrepl--output-mark' between possible
newline and actual prompt.
(:write-values): Wait for some process output before prompt.
(listener): Use `sly-mrepl--insert-output'.
(sly-mrepl-return): Set `sly-mrepl--output-mark' here, too.
(sly-mrepl--eval-for-repl): New function.
(sly-inspector-copy-down-to-repl): Simplified.
(sldb-copy-down-to-repl): Simplified (but broken).
(sly-trace-dialog-copy-down-to-repl): Simplified.
(sly-mrepl--dedicated-stream-output-filter): Use
`sly-mrepl--insert-output'.

* contrib/swank-mrepl.lisp (mrepl-eval): save bindings last.

Hopefully they will mingle correctly with the dedicated stream.

* swank-mrepl.lisp (initial-listener-env): Redirect the other
streams.

Contribs that requires `sly-repl' now require `sly-old-repl' instead.

* sly.el (sly-attempt-connection): Fix minor whitespace.
(sly-net-connect): Use `sly--net-connect-counter'
(sly--net-connect-counter): New var.

* contrib/sly-mrepl.el (sly-mrepl-new): Better naming for
processes. Arrange order.
(sly-mrepl--prompt): New local variable.
(:prompt): This method only sets `sly-mrepl--prompt'.
(sly-mrepl--prompt): Takes 0 arguments now.
(:write-values): Call `sly-mrepl--prompt'.
(sly-mrepl): Correctly find buffer.
(sly-mrepl--open-dedicated-stream): Use better stream and buffer
names.
(sly-mrepl--teardown): Rearrange teardown order.

* contrib/swank-mrepl.lisp (:compile-toplevel): Import some more functions
from SWANK.
(mrepl-eval): Track package, send prompt only if it changed. Send
results only after sending prompt.
(read-eval-print): Use SWANK:WITH-RETRY-RESTART.

* sly.el (sly-start-lisp, sly-net-connect): Call
`set-process-query-on-exit-flag' inline.
(sly-set-query-on-exit-flag): Delete it.

* swank.lisp (:swank): Export SWANK:AUTHENTICATE-CLIENT and
SWANK:*LOOPBACK-INTERFACE*.
(spawn-worker-thread, list-threads): Better thread names for
workers.

* contrib/sly-mrepl.el (sly-mrepl-hook, sly-mrepl-runonce-hook): New
hooks.
(sly-mrepl-new): Name process slightly better. Set channel buffer
and kill-buffer-hook even before ack. Run new hooks when ack'ed
from lisp.
(sly-mrepl--teardown): Moved to bottom. Delete dedicated stream
and its buffer.
(:write-string): Call `sly-mrepl--insert' inline.
(sly-mrepl--write-string): Deleted.
(sly-mrepl--dedicated-stream-output-filter): New function.
(sly-mrepl--dedicated-stream-hooks): New hook.
(sly-mrepl--open-dedicated-stream): New function.
(sly-mrepl--dedicated-stream): New buffer-local var.
(:open-dedicated-output-stream): New channel method.

* contrib/swank-mrepl.lisp (:compile-toplevel): slight whitespace cleanup.
(listener-channel): add slot for dedicated socket.
(create-mrepl): Honour SWANK-MREPL::*USE-DEDICATED-OUTPUT-STREAM*
before starting to serve requests.
(initial-listener-env): Bind *STANDARD-OUTPUT* to channels
dedicated socket if it exists.
(spawn-listener-thread): Adjust indentation.
(*use-dedicated-output-stream*, *dedicated-output-stream-port*)
(*dedicated-output-stream-buffering*): New vars.
(open-dedicated-output-stream): New function.

* sly-mrepl.el (sly-mrepl-new): Set header-line-format to nil as
soon as connection happens.
(sly-mrepl): Check `sly-buffer-connection' when looking for a repl
for the current connection.

Local channel might be a non-structure, teardown message sending might
fail, etc...

* contrib/sly-mrepl.el (sly-mrepl--teardown): Ignore errors when tearing
down.

* contrib/sly-mrepl.el (sly-mrepl): Add `sly-mrepl-connected-hook' to
`sly-connected-hook'.
(sly-mrepl-new): Generate a buffer name like old REPL.
(sly-mrepl-new): Don't set header line and insert a short banner.
(sly-mrepl-connected-hook): New function, hides *inferior-lisp*
buffer if it finds it.