; 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.

diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index b261f381382357905120fe3329d0b12655f0ba9a..6353b813805ae1a1244638c471b128a024b4483e 100644 (file)
--- 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 853ef4fb2d95320438c632df17d20b34c98556d3..0a67cf83ca8b7571ac8d08cce0a7937132e76050 100644 (file)
--- 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))