From e00560caf83a7a45e2cdbb3a0b487eb4f7d09874 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 26 Aug 2020 19:50:36 -0400 Subject: [PATCH] Fix #3827 (part 2): inverted file cookies Turns out some autodefs weren't being noop'ed when their file's cookie returns nil. This was the secondary cause of #3827. --- core/autoload/files.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/autoload/files.el b/core/autoload/files.el index 884bff0c0..1fbb99b9e 100644 --- a/core/autoload/files.el +++ b/core/autoload/files.el @@ -146,9 +146,8 @@ If COOKIE doesn't exist, return NULL-VALUE." (insert-file-contents file nil 0 256) (if (re-search-forward (format "^;;;###%s " (regexp-quote (or cookie "if"))) nil t) - (or (let ((load-file-name file)) - (eval (sexp-at-point) t)) - null-value) + (let ((load-file-name file)) + (eval (sexp-at-point) t)) null-value))) ;;;###autoload