(toplevel): Load faces before isearch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bc1ca906d5aab34d18c6f5aca694455e2d1cef5..a91e59c4f04c4a3281bb66448bcda744ef572c25 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-02  Gerd Moellmann  <gerd@gnu.org>
+
+       * loadup.el (toplevel): Load faces before isearch.
+
+       * isearch.el (isearch-faces): New custom group.
+       (isearch): New defface; was already tested for in the code.
+       (isearch-lazy-highlight-face): Changed to defface from defcustom.
+       (isearch-highlight): Always use face `isearch'.
+
 2000-10-02  Dave Love  <fx@gnu.org>
 
        * emacs-lisp/byte-opt.el (byte-optimize-lapcode): Don't bind

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0e53477e88e35b5d22c82939eed56dd8a4d6c7e..0c23fd47b81efa67250de2cfcd9089a4d42d99ea 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -105,7 +105,6 @@
 (update-coding-systems-internal)
 
 (load "indent")
-(load "isearch")
 (load "window")
 (load "frame")
 (load "term/tty-colors")
@@ -119,6 +118,7 @@
       (and (boundp 'x-toolkit-scroll-bars-p)
           (load "scroll-bar"))
       (load "select")))
+(load "isearch")
 
 (message "%s" (garbage-collect))
 (load "menu-bar")