[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 18e6a0b 2/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/ema
From: |
Michael Albinus |
Subject: |
master 18e6a0b 2/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Wed, 19 Aug 2020 07:19:37 -0400 (EDT) |
branch: master
commit 18e6a0b5c0d47c5ee98b95f9312909e0f978da89
Merge: 10b997f c570a79
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/comint.el | 13 ++++++++++---
lisp/progmodes/python.el | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/lisp/comint.el b/lisp/comint.el
index df4937a..4094969 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -223,6 +223,12 @@ This variable is buffer-local."
(other :tag "on" t))
:group 'comint)
+(defcustom comint-highlight-input t
+ "If non-nil, highlight input with `comint-highlight-input' face.
+Otherwise keep the original highlighting untouched."
+ :type 'boolean
+ :group 'comint)
+
(defface comint-highlight-input '((t (:weight bold)))
"Face to use to highlight user input."
:group 'comint)
@@ -1897,9 +1903,10 @@ Similarly for Soar, Scheme, etc."
(end (if no-newline (point) (1- (point)))))
(with-silent-modifications
(when (> end beg)
- (add-text-properties beg end
- '(front-sticky t
- font-lock-face comint-highlight-input))
+ (when comint-highlight-input
+ (add-text-properties beg end
+ '(front-sticky t
+ font-lock-face comint-highlight-input)))
(unless comint-use-prompt-regexp
;; Give old user input a field property of `input', to
;; distinguish it from both process output and unsent
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f8c1802..d83af83 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2791,6 +2791,7 @@ variable.
python-shell-comint-watch-for-first-prompt-output-filter
python-comint-postoutput-scroll-to-bottom
comint-watch-for-password-prompt))
+ (setq-local comint-highlight-input nil)
(set (make-local-variable 'compilation-error-regexp-alist)
python-shell-compilation-regexp-alist)
(add-hook 'completion-at-point-functions