From 374ed006ff6975d884cf86a8248d843009b1c59b Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sun, 10 Sep 2023 19:29:09 -0700 Subject: [PATCH] ; Add newline to erc--scrolltobottom-window-info * lisp/erc/erc-goodies.el (erc--scrolltobottom-window-info): Add `newline'. (Bug#64855) * lisp/erc/erc.el (erc-check-text-conversion): Quote variable. --- lisp/erc/erc-goodies.el | 1 + lisp/erc/erc.el | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index b261f381382..6353b813805 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el @@ -122,6 +122,7 @@ may be nil, is the number of lines between `window-start' and (defvar erc--scrolltobottom-post-force-commands '(beginning-of-buffer electric-newline-and-maybe-indent + newline default-indent-new-line) "Commands that force a scroll after execution at prompt. That is, ERC recalculates the window's start instead of blindly diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 853ef4fb2d9..0a67cf83ca8 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -8040,7 +8040,7 @@ prompt or `nil' otherwise, set it to such a value, so as to guarantee that the input method functions properly for the purpose of typing within the ERC prompt." (when (and (eq major-mode 'erc-mode) - (boundp set-text-conversion-style)) + (boundp 'text-conversion-style)) (if (>= (point) (erc-beg-of-input-line)) (unless (eq text-conversion-style 'action) (set-text-conversion-style 'action)) -- 2.39.5