Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-22

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-431
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-441
   Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/vc-rcs.el
index 02dc093,ca29587..5d020e9
--- 1/lisp/vc-rcs.el
--- 2/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@@ -5,7 -5,7 +5,7 @@@
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  
- ;; $Id: vc-rcs.el,v 1.38 2003/09/01 15:45:17 miles Exp $
 -;; $Id: vc-rcs.el,v 1.39 2004/03/21 15:46:23 spiegel Exp $
++;; $Id$
  
  ;; This file is part of GNU Emacs.
  

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fontset.c
index 016c62f,1e64c75..4901fc7
--- 1/src/fontset.c
--- 2/src/fontset.c
+++ b/src/fontset.c
@@@ -1,9 -1,7 +1,10 @@@
  /* Fontset handler.
+    Copyright (C) 2004  Free Software Foundation, Inc.
     Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
 -   Licensed to the Free Software Foundation.
 +     Licensed to the Free Software Foundation.
 +   Copyright (C) 2003
 +     National Institute of Advanced Industrial Science and Technology (AIST)
 +     Registration Number H13PRO009
  
  This file is part of GNU Emacs.
  

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/w32select.c
Simple merge

diff --cc src/xfaces.c
index be9c9af,7f5012f..6ee06ba
--- 1/src/xfaces.c
--- 2/src/xfaces.c
+++ b/src/xfaces.c
@@@ -5982,11 -5845,10 +5982,11 @@@ x_supports_face_attributes_p (f, attrs
  
        merge_face_vectors (f, attrs, merged_attrs, 0);
  
 -      face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
 +      face_id = lookup_face (f, merged_attrs);
 +      face = FACE_FROM_ID (f, face_id);
  
        if (! face)
-       signal_error ("cannot make face", 0);
+       error ("cannot make face");
  
        /* If the font is the same, then not supported.  */
        if (face->font == def_face->font)

diff --cc src/xterm.c
Simple merge