Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes

1 files changed, 26 insertions, 6 deletions

diff --git a/lisp/term.el b/lisp/term.el
index b990c83cfcb..99f1bf4f54f 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -467,6 +467,11 @@ Customize this option to nil if you want the previous behavior."
   :type 'boolean
   :group 'term)
 
+(defcustom term-set-terminal-size nil
+  "If non-nil, set the LINES and COLUMNS environment variables."
+  :type 'boolean
+  :version "28.1")
+
 (defcustom term-char-mode-point-at-process-mark t
   "If non-nil, keep point at the process mark in char mode.
 
@@ -501,6 +506,14 @@ This variable is buffer-local."
   :type 'boolean
   :group 'term)
 
+(defcustom term-scroll-snap-to-bottom t
+  "Control whether to keep the prompt at the bottom of the window.
+If non-nil, when the prompt is visible within the window, then
+scroll so that the prompt is on the bottom on any input or
+output."
+  :version "28.1"
+  :type 'boolean)
+
 (defcustom term-scroll-show-maximum-output nil
   "Controls how interpreter output causes window to scroll.
 If non-nil, then show the maximum output when the window is scrolled.
@@ -1543,9 +1556,12 @@ Nil if unknown.")
            (format term-termcap-format "TERMCAP="
                    term-term-name term-height term-width)
 
-           (format "INSIDE_EMACS=%s,term:%s" emacs-version term-protocol-version)
-           (format "LINES=%d" term-height)
-           (format "COLUMNS=%d" term-width))
+           (format "INSIDE_EMACS=%s,term:%s"
+                   emacs-version term-protocol-version))
+          (when term-set-terminal-size
+            (list
+             (format "LINES=%d" term-height)
+             (format "COLUMNS=%d" term-width)))
           process-environment))
         (process-connection-type t)
         ;; We should suppress conversion of end-of-line format.
@@ -3108,15 +3124,19 @@ See `term-prompt-regexp'."
                                     (or (eq scroll 'this) (not save-point)))
                                (and (eq scroll 'others)
                                     (not (eq selected win))))
-                       (goto-char term-home-marker)
-                       (recenter 0)
+                       (when term-scroll-snap-to-bottom
+                         (goto-char term-home-marker)
+                         (recenter 0))
                        (goto-char (process-mark proc))
                        (if (not (pos-visible-in-window-p (point) win))
                            (recenter -1)))
                      ;; Optionally scroll so that the text
                      ;; ends at the bottom of the window.
                      (when (and term-scroll-show-maximum-output
-                                (>= (point) (process-mark proc)))
+                                (>= (point) (process-mark proc))
+                                (or term-scroll-snap-to-bottom
+                                    (not (pos-visible-in-window-p
+                                          (point-max) win))))
                        (save-excursion
                          (goto-char (point-max))
                          (recenter -1)))))