merge emacs-23

18 files changed, 152 insertions, 94 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ce5007d3b3..40c0cb231e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-13  Damyan Pepper  <damyanp@gmail.com>
+
+        Fix handling of font properties on Windows (bug#6303).
+        * font.c (font_filter_properties): New function, refactored from
+        ftfont_filter_properties.
+        * font.h (font_filter_properties): Declare.
+        * ftfont.c (ftfont_filter_properties): Use font_filter_properties.
+        * w32font.c (w32font_booleans, w32font_non_booleans): New variables.
+        (w32font_filter_properties): New function.
+        (w32font_driver): Add w32font_filter_properties.
+
+2010-10-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * font.c (Ffont_variation_glyphs):
+        * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
+
 2010-10-10  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (Qleft): Declare.
@@ -134,7 +150,7 @@
         (x_produce_glyphs): Simplify by using the same code for ASCII and
         non-ASCII characters.  Don't set it->char_to_display here.
         Don't handle unibyte-display-via-language-environment here.  For a
-        charater of no glyph, use font->space_width instead of FONT_WIDTH.
+        character of no glyph, use font->space_width instead of FONT_WIDTH.
 
 2010-08-29  Kenichi Handa  <handa@m17n.org>
 
@@ -171,7 +187,7 @@
         * charset.c: Include <stdlib.h>
         (struct charset_sort_data): New struct.
         (charset_compare): New function.
-        (Fsort_charsets): New funciton.
+        (Fsort_charsets): New function.
         (syms_of_charset): Declare Fsort_charsets as a Lisp function.
 
         * coding.c (decode_coding_iso_2022): Fix checking of dimension
@@ -13872,7 +13888,7 @@
         (Ffont_shape_text): New function.
         (Fopen_font): If the font size is not given, use 12-pixel.
         (Ffont_at): New arg STRING.
-        (syms_of_font): Initalize font_charset_alist.
+        (syms_of_font): Initialize font_charset_alist.
         Declare Ffont_shape_text as a Lisp function.  Call syms_of_XXfont
         conditionally.
 
@@ -14869,7 +14885,7 @@
 
         * font.c (font_unparse_fcname): Fix typo (swidth->width).
         (font_list_entities): Check driver_list->on.
-        (register_font_driver): Initalize `on' member to 0.
+        (register_font_driver): Initialize `on' member to 0.
         (font_update_drivers): New function.
         (Fclear_font_cache): Check driver_list->on.
 
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 265cc95e60d..d90e326f970 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -683,7 +683,7 @@
         (That `select' saw something on channel 0 doesn't mean it is
         kbd input; it could be an expose event.)
 
-        * keyboard.c (read_avail_input) [FIONREAD]:  Now static.
+        * keyboard.c (read_avail_input) [FIONREAD]: Now static.
         New arg specifies value of NREAD;
         if it is nonzero, don't call get_input_pending to get it.
         Use kbd_buffer_store_char to put chars into kbd_buffer.
@@ -1210,7 +1210,7 @@
         Remove #ifndef VMS around the sleep when buffer is full.
         * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use.
 
-        * fileio.c (file_name_as_directory) [VMS]:  Fix 3rd arg to strncmp.
+        * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp.
 
 1987-07-17  Paul Rubin  (phr@prep)
 
@@ -1442,7 +1442,7 @@
         Turn on call to vmserrstr.
         * sysdep.c (vmserrstr) [VMS]: Define this function.
 
-        * process.c (create_process) [IRIS]:  Don't open the pty's tty
+        * process.c (create_process) [IRIS]: Don't open the pty's tty
         in the parent process.  Open only once, in the child.
 
         * xdisp.c (redisplay_window): If window-start points nowhere,
@@ -1544,8 +1544,8 @@
 
 1987-05-05  Richard Mlynarik  (mly@prep)
 
-        * m-irist.h:  New version from raible@orville.arpa
-        * s-iris3-5.h:  New file.  (s-usg5-2 with additions)
+        * m-irist.h: New version from raible@orville.arpa
+        * s-iris3-5.h: New file.  (s-usg5-2 with additions)
 
         * keyboard.c:
         IRIS, like HPUX, #defines but does not implement FIONREAD.
@@ -1563,10 +1563,10 @@
 1987-04-27  Richard Mlynarik  (mly@prep)
 
         * fileio.c (APOLLO from lnz):
-        Fcopy_file, Fset_file_modes: Don't use un*x modes if
+        (Fcopy_file, Fset_file_modes): Don't use un*x modes if
         env var USE_DOMAIN_ACLS is set.
-        Fset_file_modes: utimes fix.
-        Finsert_file_contents:  Must do fstat after open for Apollo.
+        (Fset_file_modes): utimes fix.
+        (Finsert_file_contents): Must do fstat after open for Apollo.
 
         * emacs.c (main): (APOLLO from lnz):
         Don't use un*x modes if env var USE_DOMAIN_ACLS set.
@@ -1675,7 +1675,7 @@
 
 1987-03-20  Richard Mlynarik  (mly@prep)
 
-        * filemode.c:  Hacks for set-uid/gid but not executable.
+        * filemode.c: Hacks for set-uid/gid but not executable.
 
 1987-03-20  Richard M. Stallman  (rms@prep)
 
@@ -1966,7 +1966,7 @@
 
 1987-02-22  Richard M. Stallman  (rms@prep)
 
-        * dispnew.c (Fopen_termscript):  Close existing termscript
+        * dispnew.c (Fopen_termscript): Close existing termscript
         file before trying to open a new one.  Report open failure
         with report_file_error.
 
@@ -2071,9 +2071,9 @@
 
 1987-02-10  Richard Mlynarik  (mly@prep)
 
-        * xfns.c (Fx_get_default):  Add (unsigned char *) cast.
+        * xfns.c (Fx_get_default): Add (unsigned char *) cast.
 
-        * window.c: typo.
+        * window.c: Typo.
 
 1987-02-09  Richard M. Stallman  (rms@prep)
 
@@ -2853,7 +2853,7 @@
         local variables for more register decls.  Compute
         and pass `envlen' arg to child_setup.
 
-        * process.c (create_process):  Compute and pass `envlen' arg
+        * process.c (create_process): Compute and pass `envlen' arg
         to child_setup.
 
         * xterm.c (x_term_init): Don't call XPopUpWindow at all.
@@ -3998,7 +3998,7 @@
         * editfns.c (Fuser_uid, Fuser_real_uid):
         New functions that return values of geteuid and getuid system calls.
 
-        * dired.c (Ffile_attributes):  Value has additional element
+        * dired.c (Ffile_attributes): Value has additional element
         t iff file gid would change if Emacs deletes it and recreates it.
 
         * xdisp.c (display_mode_element):
@@ -4078,7 +4078,7 @@
         being unbound.  struct catchtag has two new fields,
         gcpro and pdlcount.
 
-        * eval.c (Fthrow, Fsignal):  Use unbind_catch before longjmp.
+        * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp.
 
         * eval.c (internal_catch): No need to restore anything
         from the catchtag after throw, because unbind_catch does it all.
@@ -4657,7 +4657,7 @@
 
         * fileio.c (Ffile_newer_than_file_p): New Lisp primitive.
 
-        * fileio.c (Ffile_exists_p):  this is now distinct from
+        * fileio.c (Ffile_exists_p): This is now distinct from
         Ffile_readable_p; it checks only for existence, not for
         readability.
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fbe3f752aed..11c818f18d9 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -5146,7 +5146,7 @@
         Change mouse movement events to be arranged like click events.
         (format_modifiers): Note that the click modifier has no
         written representation.
-        (modifier_names, modifer_symbols): New variables, used to
+        (modifier_names, modifier_symbols): New variables, used to
         create the Qevent_symbol_elements property.
         (modify_event_symbol): Change the format of the modified
         symbol cache; there are too many modifier bits now to use a
@@ -5154,8 +5154,8 @@
         Document the format of the cache.
         Put the Qevent_symbol_elements property on each new symbol,
         instead of a Qevent_unmodified property.
-        (symbols_of_keyboard): Put Qevent_symbol_elements properties on
-        the symbols specified in head_table, not Qevent_unmodifed properties.
+        (symbols_of_keyboard): Put Qevent_symbol_elements properties on the
+        symbols specified in head_table, not Qevent_unmodified properties.
         Initialize and staticpro modifier_symbols, and staticpro the
         window elements of button_down_location.
 
@@ -11207,7 +11207,7 @@
         events to send the function key number instead of a symbol.
         * keyboard.c (modify_event_symbol): Re-arranged to work well
         with function key/mouse button numbers instead of symbols.
-        And if (MODIFIERS & up_modifer), prepend "U-" to the name of the
+        And if (MODIFIERS & up_modifier), prepend "U-" to the name of the
         symbol being constructed.
         (make_lispy_event): Use the new modify_event_symbol.
 
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index d30bd1bdb00..89d43526609 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -3107,7 +3107,7 @@
 
         * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame,
         Lisp_Subr deleted.
-        (PSEUDOVECTORP, GC_PSEUDOVECTORP):  Add paren for proper nesting.
+        (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting.
         (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors.
         (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise.
         (FRAMEP, GC_FRAMEP): Likewise.
@@ -4093,7 +4093,7 @@
 
         * xterm.h: Delete X10 code.
 
-        * xfns.c (Fx_create_frame): Don't increment refernce_count
+        * xfns.c (Fx_create_frame): Don't increment reference_count
         until the frame is put on the frame list.
 
         * xterm.c (x_initialize): Init x_noop_count, x_focus_frame
@@ -7039,7 +7039,7 @@
 
 1994-06-07  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
-        * mips-siemens.h:  Include pyramid.h, not mips.h.
+        * mips-siemens.h: Include pyramid.h, not mips.h.
         (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted.
         (NO_ARG_ARRAY, HAVE_ALLOCA): Defined.
         (BROKEN_FIONREAD): Add #undef.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 6cc3d0f9e3e..b5927108808 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -491,7 +491,7 @@
 
         * xselect.c (selection_data_to_lisp_data): Set
         Vlast_coding_system_used.
-        (lisp_data_to_selection_data): Likewize.
+        (lisp_data_to_selection_data): Likesize.
 
 1998-07-07  Richard Stallman  <rms@psilocin.ai.mit.edu>
 
@@ -502,7 +502,7 @@
         * editfns.c (Fformat): Replace explicit numeric constants with
         proper macros.
 
-        * fns.c (concat): Likewize.
+        * fns.c (concat): Likewise.
 
 1998-07-06  Kenichi Handa  <handa@etl.go.jp>
 
@@ -1040,7 +1040,7 @@
 
         * lread.c: Remember the last TWO strings skipped with #@.
         (prev_saved_doc_string*): New variables.
-        (Fload): Initalize prev_saved_doc_string.
+        (Fload): Initialize prev_saved_doc_string.
         (read1): Copy saved_doc_string to prev_saved_doc_string
         before storing a new string in saved_doc_string.
         (read_list): Look in prev_saved_doc_string as well as
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 6da7b6862a5..eeaae29db52 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -3686,7 +3686,7 @@
         * lread.c (read_escape): For Control modifier, pay attention to
         multibyte character.
         (read1): Likewise.  Signal error or a multibyte character which
-        has a modifer bit.  Check validity of Shift modifer.
+        has a modifier bit.  Check validity of Shift modifier.
 
         * charset.c (non_ascii_char_to_string): Handle modifier bits as
         the same as Lisp reader.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b161a21eb72..a56c1a2c088 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -3896,7 +3896,7 @@
 
 2001-01-07  Dave Love  <fx@gnu.org>
 
-        * keyboard.c (Fread_key_sequence_vector):  Avoid newline in
+        * keyboard.c (Fread_key_sequence_vector): Avoid newline in
         arglist, for documentation's sake.
 
 2001-01-06  Andrew Innes  <andrewi@gnu.org>
@@ -4180,7 +4180,7 @@
         what's displayed in the window.
 
         * xdisp.c (try_window_reusing_current_matrix)
-        <new start <= old start>:  Disable rows in the current matrix
+        <new start <= old start>: Disable rows in the current matrix
         which are below the window after scrolling.
 
         * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P
@@ -5480,7 +5480,7 @@
         * lisp.h (pos_visible_p): Change prototype.
 
         * dispextern.h (CURRENT_MODE_LINE_HEIGHT)
-        (CURRENT_HEADER_LINE_HEIGHT):  Look at current_mode_line_height
+        (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height
         and current_header_line_height first.
         (current_mode_line_height, current_header_line_height):
         Declare extern.
@@ -6683,7 +6683,7 @@
         (create_offscreen_bitmap): New function.
         (w32_BDF_TextOut): Use it. Draw glyphs as DIBs.
 
-        * w32term.c (x_produce_glyphs):  If the distance from the current
+        * w32term.c (x_produce_glyphs): If the distance from the current
         position to the next tab stop is less than a canonical character
         width, use the tab stop after that.
         (x_draw_glyphs): Handle case START and END are out of bounds more
@@ -7536,7 +7536,7 @@
         CYCLE_CHECK arguments.
         (merge_face_vector_with_property, Finternal_merge_in_global_face)
         (lookup_named_face, lookup_derived_face, realize_named_face)
-        (face_at_string_position, face_at_buffer_position):  Supply
+        (face_at_string_position, face_at_buffer_position): Supply
         new F and CYCLE_CHECK arguments to merge_face_vectors.
         (merge_face_heights): New function.
         (merge_face_vectors, merge_face_vector_with_property)
@@ -7826,7 +7826,7 @@
         (x_compute_glyph_string_overhangs): Incomplete body removed, as
         the X way of doing this will not work for W32.
         (w32_intersect_rectangles): Removed. Use IntersectRect API call.
-        (x_draw_image_foreground):  Avoid drawing outside of the clip area
+        (x_draw_image_foreground): Avoid drawing outside of the clip area
         when image doesn't have a mask.
         (note_mouse_highlight): Process overlays in the right order of
         priority. Set help_echo_window.
@@ -10156,7 +10156,7 @@
         (encode_coding_string): Likewise.
 
         * ccl.c (ccl_driver) <CCL_ReadMultibyteChar2>
-        <CCL_WriteMultibyteChar2>:  Handle charsets eight-bit-control and
+        <CCL_WriteMultibyteChar2>: Handle charsets eight-bit-control and
         eight-bit-graphic correctly.
 
 2000-05-24  Kenichi HANDA  <handa@etl.go.jp>
@@ -12812,7 +12812,7 @@
         (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback)
         (xim_initialize, xim_close)
         [HAVE_X_I18N && HAVE_X11R6]: New functions.
-        (x_destroy_window) [HAVE_X_I18N]:  Call xic_destroy_frame.
+        (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame.
         (x_term_init) [HAVE_X_I18N]: Call xim_initialize.
         (x_delete_display) [HAVE_X_I18N]: Call xim_close.
 
diff --git a/src/ccl.c b/src/ccl.c
index c33df9e56de..ac1d7be621c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -450,7 +450,7 @@ extern int charset_unicode;
    Therefore, the instruction code range is 0..16384(0x3fff).
  */
 
-/* Read a multibyte characeter.
+/* Read a multibyte character.
    A code point is stored into reg[rrr].  A charset ID is stored into
    reg[RRR].  */
 
@@ -2058,7 +2058,7 @@ If R0..R7 are nil, they are initialized to 0.
 If IC is nil, it is initialized to head of the CCL program.
 
 If optional 4th arg CONTINUE is non-nil, keep IC on read operation
-when read buffer is exausted, else, IC is always set to the end of
+when read buffer is exhausted, else, IC is always set to the end of
 CCL-PROGRAM on exit.
 
 It returns the contents of write buffer as a string,
diff --git a/src/dispextern.h b/src/dispextern.h
index 076d9055859..ca91c5b6812 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1873,7 +1873,7 @@ struct composition_it
      are not iterating over a composition now.  */
   int id;
   /* If non-negative, character that triggers the automatic
-     composition at `stop_pos', and this is an automatic compositoin.
+     composition at `stop_pos', and this is an automatic composition.
      If negative, this is a static composition.  This is set to -2
      temporarily if searching of composition reach a limit or a
      newline.  */
diff --git a/src/font.c b/src/font.c
index 765712198fe..77f43c81d71 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3862,6 +3862,59 @@ font_get_frame_data (f, driver)
 }
 
 
+/* Sets attributes on a font.  Any properties that appear in ALIST and
+   BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font.
+   BOOLEAN_PROPERTIES and NON_BOOLEAN_PROPERTIES are NULL-terminated
+   arrays of strings.  This function is intended for use by the font
+   drivers to implement their specific font_filter_properties.  */
+void
+font_filter_properties (font, alist, boolean_properties, non_boolean_properties)
+     Lisp_Object font;
+     Lisp_Object alist;
+     const char *boolean_properties[];
+     const char *non_boolean_properties[];
+{
+  Lisp_Object it;
+  int i;
+
+  /* Set boolean values to Qt or Qnil */
+  for (i = 0; boolean_properties[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+
+        if (strcmp (boolean_properties[i], keystr) == 0)
+          {
+            const char *str = INTEGERP (val) ? (XINT (val) ? "true" : "false")
+              : SYMBOLP (val) ? (const char *) SDATA (SYMBOL_NAME (val))
+              : "true";
+
+            if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
+                || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
+                || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
+                || strcmp ("Off", str) == 0)
+              val = Qnil;
+            else
+              val = Qt;
+
+            Ffont_put (font, key, val);
+          }
+      }
+
+  for (i = 0; non_boolean_properties[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+        if (strcmp (non_boolean_properties[i], keystr) == 0)
+          Ffont_put (font, key, val);
+      }
+}
+
+
 /* Return the font used to draw character C by FACE at buffer position
    POS in window W.  If STRING is non-nil, it is a string containing C
    at index POS.  If C is negative, get C from the current buffer or
@@ -4634,7 +4687,7 @@ DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs,
        doc: /* Return a list of variation glyphs for CHAR in FONT-OBJECT.
 Each element of the value is a cons (VARIATION-SELECTOR . GLYPH-ID),
 where
-  VARIATION-SELECTOR is a chracter code of variation selection
+  VARIATION-SELECTOR is a character code of variation selection
     (#xFE00..#xFE0F or #xE0100..#xE01EF)
   GLYPH-ID is a glyph code of the corresponding variation glyph.  */)
      (font_object, character)
diff --git a/src/font.h b/src/font.h
index 952ea269495..14b1abc4de8 100644
--- a/src/font.h
+++ b/src/font.h
@@ -574,7 +574,7 @@ struct font_driver
      FONT-ENTITY and it must be opened to check it, return -1.  */
   int (*has_char) P_ ((Lisp_Object font, int c));
 
-  /* Return a glyph code of FONT for characer C (Unicode code point).
+  /* Return a glyph code of FONT for character C (Unicode code point).
      If FONT doesn't have such a glyph, return FONT_INVALID_CODE.  */
   unsigned (*encode_char) P_ ((struct font *font, int c));
 
@@ -814,6 +814,11 @@ extern int font_put_frame_data P_ ((FRAME_PTR f,
 extern void *font_get_frame_data P_ ((FRAME_PTR f,
                                       struct font_driver *driver));
 
+extern void font_filter_properties (Lisp_Object font,
+                                    Lisp_Object alist,
+                                    const char *boolean_properties[],
+                                    const char *non_boolean_properties[]);
+
 #ifdef HAVE_FREETYPE
 extern struct font_driver ftfont_driver;
 #endif  /* HAVE_FREETYPE */
diff --git a/src/frame.h b/src/frame.h
index 887d47eff21..8f5e47c40a5 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -306,7 +306,7 @@ struct frame
   /* Canonical X unit.  Width of default font, in pixels.  */
   int column_width;
 
-  /* Widht of space glyph of default font, in pixels.  */
+  /* Width of space glyph of default font, in pixels.  */
   int space_width;
 
   /* Canonical Y unit.  Height of a line, in pixels.  */
diff --git a/src/ftfont.c b/src/ftfont.c
index 33a96143fd0..4699c74470f 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -88,7 +88,7 @@ static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object,
                                             enum ftfont_cache_for));
 
 static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist));
-                                                
+
 Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object));
 
 #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM))
@@ -264,7 +264,7 @@ ftfont_pattern_entity (p, extra)
   else
     {
       /* As this font is not scalable, parhaps this is a BDF or PCF
-         font. */ 
+         font. */
       FT_Face ft_face;
 
       ASET (entity, FONT_ADSTYLE_INDEX, get_adstyle_property (p));
@@ -2113,7 +2113,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
   return to;
 }
 
-static int 
+static int
 ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
                 MFLTGlyphString *in, int from, int to)
 {
@@ -2681,42 +2681,7 @@ ftfont_filter_properties (font, alist)
      Lisp_Object font;
      Lisp_Object alist;
 {
-  Lisp_Object it;
-  int i;
-
-  /* Set boolean values to Qt or Qnil */
-  for (i = 0; ftfont_booleans[i] != NULL; ++i)
-    for (it = alist; ! NILP (it); it = XCDR (it))
-      {
-        Lisp_Object key = XCAR (XCAR (it));
-        Lisp_Object val = XCDR (XCAR (it));
-        char *keystr = SDATA (SYMBOL_NAME (key));
-
-        if (strcmp (ftfont_booleans[i], keystr) == 0)
-          {
-            char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
-            if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
-            if (str == NULL) str = "true";
-
-            val = Qt;
-            if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
-                || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
-                || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
-                || strcmp ("Off", str) == 0)
-              val = Qnil;
-            Ffont_put (font, key, val);
-          }
-      }
-
-  for (i = 0; ftfont_non_booleans[i] != NULL; ++i)
-    for (it = alist; ! NILP (it); it = XCDR (it))
-      {
-        Lisp_Object key = XCAR (XCAR (it));
-        Lisp_Object val = XCDR (XCAR (it));
-        char *keystr = SDATA (SYMBOL_NAME (key));
-        if (strcmp (ftfont_non_booleans[i], keystr) == 0)
-          Ffont_put (font, key, val);
-      }
+  font_filter_properties (font, alist, ftfont_booleans, ftfont_non_booleans);
 }
 
 
diff --git a/src/nsterm.m b/src/nsterm.m
index fc933c099e8..d1b984d5382 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -145,24 +145,24 @@ Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
 extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft;
 
 /* Specifies which emacs modifier should be generated when NS receives
-   the Alternate modifer.  May be Qnone or any of the modifier lisp symbols. */
+   the Alternate modifier.  May be Qnone or any of the modifier lisp symbols. */
 Lisp_Object ns_alternate_modifier;
 
 /* Specifies which emacs modifier should be generated when NS receives
-   the right Alternate modifer.  Has same values as ns_alternate_modifier plus
+   the right Alternate modifier.  Has same values as ns_alternate_modifier plus
    the value Qleft which means whatever value ns_alternate_modifier has.  */
 Lisp_Object ns_right_alternate_modifier;
 
 /* Specifies which emacs modifier should be generated when NS receives
-   the Command modifer.  May be any of the modifier lisp symbols. */
+   the Command modifier.  May be any of the modifier lisp symbols. */
 Lisp_Object ns_command_modifier;
 
 /* Specifies which emacs modifier should be generated when NS receives
-   the Control modifer.  May be any of the modifier lisp symbols. */
+   the Control modifier.  May be any of the modifier lisp symbols. */
 Lisp_Object ns_control_modifier;
 
 /* Specifies which emacs modifier should be generated when NS receives
-   the Function modifer (laptops).  May be any of the modifier lisp symbols. */
+   the Function modifier (laptops).  May be any of the modifier lisp symbols. */
 Lisp_Object ns_function_modifier;
 
 /* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */
diff --git a/src/print.c b/src/print.c
index ccbf8d8c0c7..43f17a7c15d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1450,7 +1450,7 @@ static void print_check_string_charset_prop ();
 #define PRINT_STRING_NON_CHARSET_FOUND 1
 #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2
 
-/* Bitwize or of the abobe macros. */
+/* Bitwise or of the above macros. */
 static int print_check_string_result;
 
 static void
diff --git a/src/regex.c b/src/regex.c
index 85ff9b99604..7d12089fea2 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -4145,7 +4145,7 @@ analyse_first (p, pend, fastmap, multibyte)
                    && match_any_multibyte_characters == false)
             {
               /* Set fastmap[I] to 1 where I is a leading code of each
-                 multibyte characer in the range table. */
+                 multibyte character in the range table. */
               int c, count;
               unsigned char lc1, lc2;
 
diff --git a/src/w32font.c b/src/w32font.c
index e93dbca2ddb..e38e1a56fb8 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -346,7 +346,7 @@ w32font_has_char (entity, c)
 }
 
 /* w32 implementation of encode_char for font backend.
-   Return a glyph code of FONT for characer C (Unicode code point).
+   Return a glyph code of FONT for character C (Unicode code point).
    If FONT doesn't have such a glyph, return FONT_INVALID_CODE.
 
    For speed, the gdi backend uses unicode (Emacs calls encode_char
@@ -2446,6 +2446,25 @@ in the font selection dialog. */)
   return DECODE_SYSTEM (build_string (buf));
 }
 
+static const char *w32font_booleans [] = {
+  NULL,
+};
+
+static const char *w32font_non_booleans [] = {
+  ":script",
+  ":antialias",
+  ":style",
+  NULL,
+};
+
+static void
+w32font_filter_properties (font, alist)
+     Lisp_Object font;
+     Lisp_Object alist;
+{
+  font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans);
+}
+
 struct font_driver w32font_driver =
   {
     0, /* Qgdi */
@@ -2475,7 +2494,7 @@ struct font_driver w32font_driver =
     NULL, /* shape */
     NULL, /* check */
     NULL, /* get_variation_glyphs */
-    NULL, /* filter_properties */
+    w32font_filter_properties,
   };
 
 
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index cfdf629ceee..9cd1ac6426c 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -448,7 +448,7 @@ uniscribe_shape (lgstring)
 }
 
 /* Uniscribe implementation of encode_char for font backend.
-   Return a glyph code of FONT for characer C (Unicode code point).
+   Return a glyph code of FONT for character C (Unicode code point).
    If FONT doesn't have such a glyph, return FONT_INVALID_CODE.  */
 static unsigned
 uniscribe_encode_char (font, c)