From: Miles Bader <miles@gnu.org>
Date: Mon, 11 Jun 2007 02:30:42 +0000 (+0000)
Subject: Merge from emacs--unicode--0
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84063599c56cf78d41e29f5788a55d6b5a564484;p=emacs.git

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
---

84063599c56cf78d41e29f5788a55d6b5a564484
diff --cc lisp/ChangeLog.unicode
index 7c8ab402884,b6dc3deeeaf..7eb601d32c7
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@@ -1,3 -1,30 +1,28 @@@
+ 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).
 -	(glyph-char): Likewise.
 -	(glyph-face): Likewise.
+ 
  2007-05-16  Juanma Barranquero  <lekktu@gmail.com>
  
  	* printing.el (pr-ps-fast-fire): Fix typos in docstring.
diff --cc src/macterm.c
index 7d3e125b213,1a67a9ebec1..43d42f2aae4
--- a/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)