*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fcdef18f5e76618e37963e8a69bb0b61dac809c..7b9058c628447d3fbcfc9517217c888e6c9e6498 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 9d9062e2aa950a5a0480e95be8abd2a91f1ccb4d..f4f9b8d6537e9077f9aa225f2acad09f62d2a904 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.