[Emacs-diffs] emacs-25 fbfd478: Avoid aborting due to errors in arguments of 'set-face-attribute'

[Eli Zaretskii]

branch: emacs-25
commit fbfd4787fbec11fe69f5e661e7c5ab4436f7cb72
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 src/xfaces.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xfaces.c b/src/xfaces.c
index ac13700..88f5f34 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.  */