# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1232283085 0
# Node ID c02fdef8db8bb4fdb7c9e503d12bd5b56181c037
# Parent  68f74b080e9421c23fc2b7d36809d46a1ff02a40# Parent  1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7
Merge.

diff -r 1d11ecca9cd0 -r c02fdef8db8b lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 18 12:49:53 2009 +0000
+++ b/lisp/ChangeLog	Sun Jan 18 12:51:25 2009 +0000
@@ -1,3 +1,10 @@
+2009-01-18  Ville Skyttä  <scop@xemacs.org>
+
+	* font.el (font-*-p): Docstring spelling fix.
+	(set-font-*-p): Ditto.
+
+	* modeline.el (modeline-3d-p): Fix docstring copy-pasto.
+
 2009-01-13  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* mule/mule-cmds.el (set-language-environment-coding-systems): 
diff -r 1d11ecca9cd0 -r c02fdef8db8b lisp/font.el
--- a/lisp/font.el	Sun Jan 18 12:49:53 2009 +0000
+++ b/lisp/font.el	Sun Jan 18 12:51:25 2009 +0000
@@ -216,13 +216,13 @@
 	   "Bitmask for whether a font is to be rendered in %s or not."
 	   attr))
        (defun ,(intern (format "font-%s-p" attr)) (fontobj)
-	 ,(format "Whether FONTOBJ will be renderd in `%s' or not." attr)
+	 ,(format "Whether FONTOBJ will be rendered in `%s' or not." attr)
 	 (if (/= 0 (logand (font-style fontobj)
 		      ,(intern (format "font-%s-mask" attr))))
 	     t
 	   nil))
        (defun ,(intern (format "set-font-%s-p" attr)) (fontobj val)
-	 ,(format "Set whether FONTOBJ will be renderd in `%s' or not."
+	 ,(format "Set whether FONTOBJ will be rendered in `%s' or not."
 		  attr)
 	 (cond
 	  (val
diff -r 1d11ecca9cd0 -r c02fdef8db8b lisp/modeline.el
--- a/lisp/modeline.el	Sun Jan 18 12:49:53 2009 +0000
+++ b/lisp/modeline.el	Sun Jan 18 12:51:25 2009 +0000
@@ -44,7 +44,7 @@
 	 (specifier-instance modeline-shadow-thickness)))
     (and (integerp thickness)
 	 (> thickness 0)))
-  "Whether the default toolbar is globally visible.
+  "Whether the modeline is displayed with raised, 3-d appearance.
 This option only has an effect when set using `customize-set-variable',
 or through the Options menu."
   :group 'display
diff -r 1d11ecca9cd0 -r c02fdef8db8b src/ChangeLog
--- a/src/ChangeLog	Sun Jan 18 12:49:53 2009 +0000
+++ b/src/ChangeLog	Sun Jan 18 12:51:25 2009 +0000
@@ -2,7 +2,12 @@
 
 	* chartab.c (print_table_entry): 
 	Print char table values correctly, eliminating some confusion
-	between symbols and strings. 
+	between symbols and strings.
+
+2009-01-10  Aidan Kehoe <kehoea@parhasard.net>
+
+	* objects-msw.c (mswindows_font_spec_matches_charset_stage_2): 
+	Accept msprinter as well as mswindows devices here. 
 
 2008-12-30  Aidan Kehoe  <kehoea@parhasard.net>
 
diff -r 1d11ecca9cd0 -r c02fdef8db8b src/objects-msw.c
--- a/src/objects-msw.c	Sun Jan 18 12:49:53 2009 +0000
+++ b/src/objects-msw.c	Sun Jan 18 12:51:25 2009 +0000
@@ -2064,8 +2064,21 @@
   else
     {
       HDC hdc = CreateCompatibleDC (NULL);
-      Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (d);
-      Lisp_Object truename;
+      Lisp_Object font_list = Qnil, truename; 
+
+      if (DEVICE_TYPE_P (d, mswindows))
+	{
+	  font_list = DEVICE_MSWINDOWS_FONTLIST (d);
+	}
+      else if (DEVICE_TYPE_P (d, msprinter))
+	{
+	  font_list = DEVICE_MSPRINTER_FONTLIST (d);
+	}
+      else
+	{
+	  assert(0);
+	}
+
       HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
 						 font_list,
 						 ERROR_ME_DEBUG_WARN,