From c6240fb0f0d9932fb0986ee2426162b90b99b633 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Fri, 13 Sep 2024 19:32:55 +0200 Subject: [PATCH] Don't override 'comint-prompt-read-only' by default * lisp/cmuscheme.el (inferior-scheme-mode): Remove 'setq-local'. * lisp/ielm.el (ielm-prompt-read-only): Inherit default from 'comint-prompt-read-only'. * lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua): Remove 'setq-local'. * lisp/progmodes/php-ts-mode.el (inferior-php-ts-mode): Remove 'setq-local'. * lisp/progmodes/python.el (inferior-python-mode): Remove 'setq-local'. --- lisp/cmuscheme.el | 1 - lisp/ielm.el | 2 +- lisp/progmodes/lua-ts-mode.el | 1 - lisp/progmodes/php-ts-mode.el | 1 - lisp/progmodes/python.el | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index d4316fb1175..912fe6b8eca 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -195,7 +195,6 @@ inferior-scheme-mode (scheme-mode-variables) (setq mode-line-process '(":%s")) (setq comint-input-filter (function scheme-input-filter)) - (setq-local comint-prompt-read-only t) (setq comint-get-old-input (function scheme-get-old-input))) (defcustom inferior-scheme-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'" diff --git a/lisp/ielm.el b/lisp/ielm.el index e583e0fe32c..1b8702abc1f 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -46,7 +46,7 @@ ielm-noisy "If non-nil, IELM will beep on error." :type 'boolean) -(defcustom ielm-prompt-read-only t +(defcustom ielm-prompt-read-only comint-prompt-read-only "If non-nil, the IELM prompt is read only. The read only region includes the newline before the prompt. Setting this variable does not affect existing IELM runs. diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el index 06daadbc1fd..2d039424a2f 100644 --- a/lisp/progmodes/lua-ts-mode.el +++ b/lisp/progmodes/lua-ts-mode.el @@ -645,7 +645,6 @@ lua-ts-inferior-lua (with-current-buffer lua-ts-inferior-buffer (setq-local comint-input-ignoredups t comint-input-ring-file-name lua-ts-inferior-history - comint-prompt-read-only t comint-prompt-regexp (rx-to-string `(: bol ,lua-ts-inferior-prompt (1+ space)))) diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 3f89de14075..e3d14bd563c 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -1563,7 +1563,6 @@ inferior-php-ts-mode (setq-local scroll-conservatively 1 comint-input-ring-file-name php-ts-mode-inferior-history comint-input-ignoredups t - comint-prompt-read-only t comint-use-prompt-regexp t comint-prompt-regexp (concat "^" php-ts-mode--inferior-prompt " ")) (comint-read-input-ring t)) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 669638544ce..17563d29c63 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3672,7 +3672,6 @@ inferior-python-mode (setq-local python-shell--prompt-calculated-output-regexp nil) (python-shell-prompt-set-calculated-regexps) (setq comint-prompt-regexp python-shell--prompt-calculated-input-regexp) - (setq-local comint-prompt-read-only t) (setq mode-line-process '(":%s")) (setq-local comint-output-filter-functions '(ansi-color-process-output -- 2.45.2