summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/icomplete.el1
-rw-r--r--lisp/progmodes/eglot.el2
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 0adb0e5afeb..4f39afb69f4 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -661,6 +661,7 @@ Usually run by inclusion in `minibuffer-setup-hook'."
(setq-local icomplete-hide-common-prefix nil
;; Ask `icomplete-completions' to return enough completions candidates.
icomplete-prospects-height 25
+ truncate-lines t
redisplay-adhoc-scroll-in-resize-mini-windows nil))
;;;###autoload
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index b17370ebf8b..a11ec0e4bbd 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3603,8 +3603,10 @@ If NOERROR, return predicate, else erroring function."
(goto-char (eglot--lsp-position-to-point position))
(when (or (> (point) to) (< (point) from)) (cl-return))
(let ((left-pad (and paddingLeft
+ (not (eq paddingLeft :json-false))
(not (memq (char-before) '(32 9))) " "))
(right-pad (and paddingRight
+ (not (eq paddingRight :json-false))
(not (memq (char-after) '(32 9))) " ")))
(cl-flet
((do-it (text lpad rpad)