From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 24 May 2016 16:04:16 +0000 (+0300)
Subject: Avoid aborting due to errors in arguments of 'set-face-attribute'
X-Git-Tag: emacs-25.0.95~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fbfd478;p=emacs.git

Avoid aborting due to errors in arguments of 'set-face-attribute'

* src/xfaces.c (Finternal_set_lisp_face_attribute): Check the
FRAME argument before using it.  This avoids gratuitous aborts in
Emacs built with --enable-checking when the luser was unlucky
enough to get the argument list in wrong order.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index ac1370003df..88f5f3415b0 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2678,9 +2678,10 @@ FRAME 0 means change the face on all frames, and change the default
     {
       if (NILP (frame))
 	frame = selected_frame;
-      f = XFRAME (frame);
 
       CHECK_LIVE_FRAME (frame);
+      f = XFRAME (frame);
+
       lface = lface_from_face_name (f, face, false);
 
       /* If a frame-local face doesn't exist yet, create one.  */