[elpa] externals/compat 7245918 96/99: Fix handling of file-missing in require advice

[ELPA Syncer]

branch: externals/compat
commit 7245918fb88167ac69978f90360e03ed89989613
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Fix handling of file-missing in require advice
---
 compat.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/compat.el b/compat.el
index f666871..16f56a3 100644
--- a/compat.el
+++ b/compat.el
@@ -151,14 +151,13 @@ advice."
       (funcall oldfun feature filename)
     (file-missing
      (let ((entry (assq feature after-load-alist)))
-       (unless (and entry
-                    (get feature 'setup-deferred-p)
-                    (null noerror))
+       (when (and entry
+                  (get feature 'setup-deferred-p)
+                  (null noerror))
          (signal (car err) (cdr err)))
        (let ((load-file-name nil))
          (dolist (form (cdr entry))
-           (funcall (eval form t))))
-       feature))
+           (funcall (eval form t))))))
     (error
      (unless noerror
        (signal (car err) (cdr err))))))