Merge from emacs--unicode--0

Patches applied:

 * emacs--devo--0  (patch 771-792)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22, gnus--rel--5.10
   - Fix tq.el edge case
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 26-41)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

 * emacs--unicode--0  (patch 210-219)

   - Merge from emacs--devo--0
   - Update from CVS

 * gnus--rel--5.10  (patch 224-228)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-63

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc lisp/ChangeLog.unicode
index 7c8ab4028847e47ec231ed719dc20de0676f4280,b6dc3deeeafb4a26bac55886350a4df1cf827055..7eb601d32c70047c8aa6bb862fbfe5a4629a9e3e
--- 1/lisp/ChangeLog.unicode
--- 2/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@@ -1,3 -1,30 +1,28 @@@
 -      (glyph-char): Likewise.
 -      (glyph-face): Likewise.
+ 2007-06-01  Jason Rumney  <jasonr@gnu.org>
+ 
+       * faces.el (font-weight-table): Use defaults on w32 that match
+       LOGFONT.lfWeight.
+ 
+       * term/w32-win.el: Don't create fontset from command-line font.
+ 
+ 2007-05-29  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * international/mule-cmds.el (toggle-enable-multibyte-characters)
+       (sort-coding-systems, search-unencodable-char): Doc fixes.
+       (default-input-method, input-method-verbose-flag)
+       (input-method-highlight-flag): Remove * in defcustom's docstrings.
+       (exit-language-environment-hook, set-default-coding-systems)
+       (coding-system-change-eol-conversion, prefer-coding-system)
+       (find-multibyte-characters, leim-list-entry-regexp)
+       (set-input-method, input-method-exit-on-first-char, princ-list)
+       (locale-language-names, locale-charset-language-names)
+       (define-char-code-property): Fix typos in docstrings.
+ 
+ 2007-05-28  Kenichi Handa  <handa@m17n.org>
+ 
+       * disp-table.el (make-glyph-code): Fix for a new character code
+       space (22-bit).
+ 
  2007-05-16  Juanma Barranquero  <lekktu@gmail.com>
  
        * printing.el (pr-ps-fast-fire): Fix typos in docstring.

diff --cc src/ChangeLog.unicode
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/macterm.c
index 7d3e125b2137f2d19e3c4931cb7544806a3c8c78,1a67a9ebec12e1cb75471db2bff70386fb85ad3c..43d42f2aae4ad4f5e321a10d78fb6852c08f9c9f
--- 1/src/macterm.c
--- 2/src/macterm.c
+++ b/src/macterm.c
@@@ -265,9 -260,8 +260,9 @@@ static void x_scroll_bar_report_motion 
                                            Lisp_Object *, Lisp_Object *,
                                            unsigned long *));
  
- static int is_emacs_window P_ ((WindowPtr));
+ static int is_emacs_window P_ ((WindowRef));
 -static XCharStruct *mac_per_char_metric P_ ((XFontStruct *, XChar2b *, int));
 +static XCharStruct *mac_per_char_metric P_ ((FRAME_PTR,
 +                                             XFontStruct *, XChar2b *, int));
  static void XSetFont P_ ((Display *, GC, XFontStruct *));
  
  #define GC_FORE_COLOR(gc)     (&(gc)->fore_color)

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xterm.c
Simple merge