# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1117915753 0
# Node ID 1ed6054e7e740d103a348128719eab991dc9bad9
# Parent  3d0a19c72e8d00ae943a6d32a3a1c51e20e528b1
*** empty log message ***

diff -r 3d0a19c72e8d -r 1ed6054e7e74 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 04 20:00:54 2005 +0000
+++ b/lisp/ChangeLog	Sat Jun 04 20:09:13 2005 +0000
@@ -1,7 +1,23 @@
 2005-06-04  Matt Hodges  <MPHodges@member.fsf.org>
 
-	* iswitchb.el (iswitchb-get-matched-buffers): Handle
-	invalid-regexp errors in post-command-hook.
+	* iswitchb.el (iswitchb-single-match-face)
+	(iswitchb-current-match-face, iswitchb-virtual-matches-face)
+	(iswitchb-invalid-regexp-face): New faces.
+	(iswitchb-completions): Use them.
+	(iswitchb-use-faces): Renamed from iswitchb-use-fonts, which is
+	now marked as an obsolete alias.
+	(iswitchb-read-buffer): Remove check for bound font variables.
+	(iswitchb-invalid-regexp): New free variable.
+	(iswitchb-get-matched-buffers): Catch invalid-regexp errors and
+	set iswitchb-invalid-regexp.
+	(iswitchb, iswitchb-complete, iswitchb-completions): Deal with
+	invalid regexps.
+	(iswitchb-completions): Add check for complete match when entering
+	a regexp.
+	(iswitchb-completions): Remove require-match argument.
+	(iswitchb-exhibit): Fix caller. 
+	(iswitchb-common-match-inserted): New variable.
+	(iswitchb-complete, iswitchb-completion-help): Use it.
 
 2005-06-04  David Reitter  <david.reitter@gmail.com>  (tiny change)
 
diff -r 3d0a19c72e8d -r 1ed6054e7e74 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 04 20:00:54 2005 +0000
+++ b/src/ChangeLog	Sat Jun 04 20:09:13 2005 +0000
@@ -1,5 +1,7 @@
 2005-06-04  Eli Zaretskii  <eliz@gnu.org>
 
+	* s/ms-w32.h (fileno): Don't define if already defined.
+
 	* emacs.c: Include w32heap.h, to avoid compiler warning about
 	sbrk.