Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-216
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-217
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-218
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-219
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-220
   Improve tq.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-221
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-222
   Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * emacs@sv.gnu.org/emacs--devo--0--patch-223
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-224
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-225
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-226
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-227
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-228
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-229
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-230
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-231
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-232
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-233
   Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-84
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-85
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-86
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-550

1 files changed, 22 insertions, 18 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 27edd1a45dc..3222a7bdd91 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4991,10 +4991,12 @@ Default face attributes override any local face attributes.  */)
   gvec = XVECTOR (global_lface)->contents;
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (! UNSPECIFIEDP (gvec[i]))
-      if (IGNORE_DEFFACE_P (gvec[i]))
-        lvec[i] = Qunspecified;
-      else
-        lvec[i] = gvec[i];
+      {
+        if (IGNORE_DEFFACE_P (gvec[i]))
+          lvec[i] = Qunspecified;
+        else
+          lvec[i] = gvec[i];
+      }
 
   return Qnil;
 }
@@ -6814,20 +6816,22 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family)
 
 #ifdef MAC_OS
   if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry))
-    if (xstricmp (SDATA (registry), "mac-roman") == 0)
-      /* When realizing the default face and a font spec does not
-         matched exactly, Emacs looks for ones with the same registry
-         as the default font.  On the Mac, this is mac-roman, which
-         does not work if the family is -etl-fixed, e.g.  The
-         following widens the choices and fixes that problem.  */
-      nfonts = try_alternative_families (f, try_family, Qnil, fonts);
-    else if (SBYTES (try_family) > 0
-             && SREF (try_family, SBYTES (try_family) - 1) != '*')
-      /* Some Central European/Cyrillic font family names have the
-         Roman counterpart name as their prefix.  */
-      nfonts = try_alternative_families (f, concat2 (try_family,
-                                                     build_string ("*")),
-                                         registry, fonts);
+    {
+      if (xstricmp (SDATA (registry), "mac-roman") == 0)
+        /* When realizing the default face and a font spec does not
+           matched exactly, Emacs looks for ones with the same registry
+           as the default font.  On the Mac, this is mac-roman, which
+           does not work if the family is -etl-fixed, e.g.  The
+           following widens the choices and fixes that problem.  */
+        nfonts = try_alternative_families (f, try_family, Qnil, fonts);
+      else if (SBYTES (try_family) > 0
+               && SREF (try_family, SBYTES (try_family) - 1) != '*')
+        /* Some Central European/Cyrillic font family names have the
+           Roman counterpart name as their prefix.  */
+        nfonts = try_alternative_families (f, concat2 (try_family,
+                                                       build_string ("*")),
+                                           registry, fonts);
+    }
 #endif
 
   if (EQ (try_family, family))