diff options
| author | Eli Zaretskii | 2001-01-28 13:13:00 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-01-28 13:13:00 +0000 |
| commit | 8005142f86a09b989b32998a1dd0e7c7b7af53ac (patch) | |
| tree | 391adc6308ebae081ff9b3ca9497cdf7d982831c | |
| parent | 83a96b4d5479a91a4b53d6a6eb348497bba93179 (diff) | |
| download | emacs-8005142f86a09b989b32998a1dd0e7c7b7af53ac.tar.gz emacs-8005142f86a09b989b32998a1dd0e7c7b7af53ac.zip | |
(isearch-highlight): Don't punt if the display
doesn't support colors, since isearch faces are defined for
monochrome displays as well.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/isearch.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3662a6a1d5c..3e4f1ae7e33 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2001-01-28 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * isearch.el (isearch-highlight): Don't punt if the display | ||
| 4 | doesn't support colors, since isearch faces are defined for | ||
| 5 | monochrome displays as well. | ||
| 6 | |||
| 1 | 2001-01-27 Sam Steingold <sds@gnu.org> | 7 | 2001-01-27 Sam Steingold <sds@gnu.org> |
| 2 | 8 | ||
| 3 | * shell.el (shell-write-history-on-exit): Make sure that we are in | 9 | * shell.el (shell-write-history-on-exit): Make sure that we are in |
diff --git a/lisp/isearch.el b/lisp/isearch.el index ff63d5ab3d0..8a69d51a93b 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -1744,7 +1744,7 @@ If there is no completion possible, say so and continue searching." | |||
| 1744 | (defvar isearch-overlay nil) | 1744 | (defvar isearch-overlay nil) |
| 1745 | 1745 | ||
| 1746 | (defun isearch-highlight (beg end) | 1746 | (defun isearch-highlight (beg end) |
| 1747 | (unless (or (null search-highlight) (null (display-color-p))) | 1747 | (unless (null search-highlight) |
| 1748 | (cond (isearch-overlay | 1748 | (cond (isearch-overlay |
| 1749 | ;; Overlay already exists, just move it. | 1749 | ;; Overlay already exists, just move it. |
| 1750 | (move-overlay isearch-overlay beg end (current-buffer))) | 1750 | (move-overlay isearch-overlay beg end (current-buffer))) |