Merge remote-tracking branch 'origin/master' into for-steve

[sxemacs] / lisp / font.el

diff --git a/lisp/font.el b/lisp/font.el
index 011b224..66c7b5c 100644 (file)
--- a/lisp/font.el
+++ b/lisp/font.el
@@ -115,7 +115,6 @@
 
 (defconst font-window-system-mappings
   '((x         . (x-font-create-name x-font-create-object))
-    (gtk       . (x-font-create-name x-font-create-object))
     (tty       . (tty-font-create-plist tty-font-create-object)))
   "An assoc list mapping device types to a list of translations.
 
@@ -471,9 +470,9 @@ The type may be the strings \"px\", \"pix\", or \"pixel\" (pixels), \"pt\" or
                                    (boundp 'x-font-regexp)
                                    x-font-regexp)
  (let
-     ((-               "[-?]")
+     ((-               "[-?]")
       (foundry         "[^-]*")
-      (family          "[^-]*")
+      (family          "[^-]*")
       ;(weight         #r"\(bold\|demibold\|medium\|black\)")
       (weight\?                #r"\([^-]*\)")
       ;(slant          #r"\([ior]\)")