aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-10-22 12:36:41 +0000
committerMiles Bader2000-10-22 12:36:41 +0000
commit7ff4fda53396cda8c9b4c6807365ab8fb96569d7 (patch)
treeac03cc9245af6d2544f8928cecb03f2e83596b0e
parent988cded7c012d7bf8585f55afa961b34269ddcf6 (diff)
downloademacs-7ff4fda53396cda8c9b4c6807365ab8fb96569d7.tar.gz
emacs-7ff4fda53396cda8c9b4c6807365ab8fb96569d7.zip
(comint-highlight-input, comint-highlight-prompt):
Renamed, `-face' at end removed. (comint-send-input, comint-output-filter): Use renamed faces.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/comint.el13
2 files changed, 10 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b084904e14b..8df7088503b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12000-10-22 Miles Bader <miles@gnu.org> 12000-10-22 Miles Bader <miles@gnu.org>
2 2
3 * comint.el (comint-highlight-input, comint-highlight-prompt):
4 Renamed, `-face' at end removed.
5 (comint-send-input, comint-output-filter): Use renamed faces.
6
3 * window.el (fit-window-to-buffer): Change defaulting of 7 * window.el (fit-window-to-buffer): Change defaulting of
4 MAX-HEIGHT slightly. 8 MAX-HEIGHT slightly.
5 9
diff --git a/lisp/comint.el b/lisp/comint.el
index 296d5b64f14..a48dd1e7ce3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -207,21 +207,20 @@ This variable is buffer-local."
207 207
208(defcustom comint-highlight-input t 208(defcustom comint-highlight-input t
209 "*If non-nil, highlight input; also allow choosing previous input with a mouse. 209 "*If non-nil, highlight input; also allow choosing previous input with a mouse.
210See also `comint-highlight-face'." 210The face used is `comint-highlight-input'."
211 :type 'boolean 211 :type 'boolean
212 :group 'comint) 212 :group 'comint)
213 213
214(defface comint-highlight-input-face '((t (:bold t))) 214(defface comint-highlight-input '((t (:bold t)))
215 "Face to use to highlight input when `comint-highlight-input' is non-nil." 215 "Face to use to highlight input when `comint-highlight-input' is non-nil."
216 :group 'comint) 216 :group 'comint)
217 217
218(defcustom comint-highlight-prompt t 218(defcustom comint-highlight-prompt t
219 "*If non-nil, highlight program prompts. 219 "*If non-nil, highlight program prompts.
220See also `comint-highlight-face'." 220The face used is `comint-highlight-prompt'."
221 :type 'boolean
222 :group 'comint) 221 :group 'comint)
223 222
224(defface comint-highlight-prompt-face 223(defface comint-highlight-prompt
225 '((((background dark)) (:foreground "cyan")) 224 '((((background dark)) (:foreground "cyan"))
226 (t (:foreground "dark blue"))) 225 (t (:foreground "dark blue")))
227 "Face to use to highlight prompt when `comint-highlight-prompt' is non-nil." 226 "Face to use to highlight prompt when `comint-highlight-prompt' is non-nil."
@@ -1415,7 +1414,7 @@ Similarly for Soar, Scheme, etc."
1415 (overlay-put over 'field 'input) 1414 (overlay-put over 'field 'input)
1416 (overlay-put over 'front-sticky t)) 1415 (overlay-put over 'front-sticky t))
1417 (when comint-highlight-input 1416 (when comint-highlight-input
1418 (overlay-put over 'face 'comint-highlight-input-face) 1417 (overlay-put over 'face 'comint-highlight-input)
1419 (overlay-put over 'mouse-face 'highlight) 1418 (overlay-put over 'mouse-face 'highlight)
1420 (overlay-put over 'evaporate t)))) 1419 (overlay-put over 'evaporate t))))
1421 (unless comint-use-prompt-regexp-instead-of-fields 1420 (unless comint-use-prompt-regexp-instead-of-fields
@@ -1583,7 +1582,7 @@ This variable is permanent-local.")
1583 prompt-start (point)) 1582 prompt-start (point))
1584 ;; Need to create the overlay 1583 ;; Need to create the overlay
1585 (let ((over (make-overlay prompt-start (point)))) 1584 (let ((over (make-overlay prompt-start (point))))
1586 (overlay-put over 'face 'comint-highlight-prompt-face) 1585 (overlay-put over 'face 'comint-highlight-prompt)
1587 (overlay-put over 'front-sticky t) 1586 (overlay-put over 'front-sticky t)
1588 (overlay-put over 'rear-nonsticky t) 1587 (overlay-put over 'rear-nonsticky t)
1589 (setq comint-last-prompt-overlay over)))))) 1588 (setq comint-last-prompt-overlay over))))))