]> git.eshelyaron.com Git - emacs.git/commitdiff
style nit into load_comp_unit
authorAndrea Corallo <akrl@sdf.org>
Sun, 17 Nov 2019 11:46:21 +0000 (12:46 +0100)
committerAndrea Corallo <akrl@sdf.org>
Wed, 1 Jan 2020 10:38:06 +0000 (11:38 +0100)
src/comp.c

index 2638290859fb989e381ca3ed8e7b31ce91ccad53..e5d703f769ff509497ae2e26e635fe9470152ee8 100644 (file)
@@ -3217,20 +3217,18 @@ load_comp_unit (dynlib_handle_ptr handle, char *file_name)
       Lisp_Object subr = Fsymbol_function (f_sym);
       if (!NILP (subr))
        {
-         if (!SUBRP (subr))
-           {
+         if (!SUBRP (subr)
              /* If is not a subr try to recover the original one assuming was
                 advised.  */
-             if (!(!NILP (CALL1I (ad-has-any-advice, f_sym))
-                   && SUBRP (subr = CALL1I (ad-get-orig-definition, f_sym))))
-               {
-                 /* FIXME: This is not robust in case of primitive
-                    redefinition.  */
-                 err_msg = format_string ("primitive %s redefined "
-                                          "or wrong relocation?",
-                                          f_str);
-                 goto exit_error;
-               }
+             && !(!NILP (CALL1I (ad-has-any-advice, f_sym))
+                  && SUBRP (subr = CALL1I (ad-get-orig-definition, f_sym))))
+           {
+             /* FIXME: This is not robust in case of primitive
+                redefinition.  */
+             err_msg = format_string ("primitive %s redefined "
+                                      "or wrong relocation?",
+                                      f_str);
+             goto exit_error;
            }
          f_relocs[i] = XSUBR (subr)->function.a0;
        }