branch: elpa/slime
commit 7f6194c8257f399e6b67b5d0147e4a857882cca2
Author: Stas Boukarev <stass...@gmail.com>
Commit: Stas Boukarev <stass...@gmail.com>
Old emacs compatibility.
---
slime.el | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/slime.el b/slime.el
index b28f6b851b..b1c7e476df 100644
--- a/slime.el
+++ b/slime.el
@@ -4051,11 +4051,12 @@ the display stuff that we neither need nor want."
;;;; Interactive evaluation.
-(defun slime-max-mini-window-lines (&optional frame)
- (cond ((floatp max-mini-window-height) (* (frame-height frame)
- max-mini-window-height))
- ((integerp max-mini-window-height) max-mini-window-height)
- (t 1)))
+(defun slime-max-mini-window-lines ()
+ (if resize-mini-windows
+ (if (fboundp 'max-mini-window-lines)
+ (truncate (max-mini-window-lines))
+ 5)
+ 1))
(defun slime-interactive-eval (string)
"Read and evaluate STRING and print value in minibuffer.
@@ -4066,9 +4067,7 @@ inserted in the current buffer."
(cl-case current-prefix-arg
((nil)
(slime-eval-with-transcript `(swank:interactive-eval ,string
- ,(if
resize-mini-windows
- (truncate
(slime-max-mini-window-lines))
- 1)
+
,(slime-max-mini-window-lines)
,(window-width))))
((-)
(slime-eval-save string))
@@ -4156,9 +4155,7 @@ Use `slime-re-evaluate-defvar' if the from starts with
'(defvar'"
(slime-eval-with-transcript
`(swank:interactive-eval-region
,(buffer-substring-no-properties start end)
- ,(if resize-mini-windows
- (truncate (slime-max-mini-window-lines))
- 1)
+ ,(slime-max-mini-window-lines)
,(window-width))))
(defun slime-pprint-eval-region (start end)
@@ -5923,9 +5920,7 @@ VAR should be a plist with the keys :name, :id, and
:value."
(interactive (sldb-read-form-for-frame "Eval in frame (%s)> "))
(slime-eval-async
`(swank:pprint-eval-string-in-frame ,string ,frame ,package
- ,(if resize-mini-windows
- (truncate
(slime-max-mini-window-lines))
- 1)
+ ,(slime-max-mini-window-lines)
,(window-width))
(lambda (result)
(slime-show-description result nil))))
