Merge branch 'maint'

lisp/org.el

@@ -9258,10 +9258,9 @@ definitions."
 			  (string-match (cdr rr) (symbol-name major-mode)))
 		     (and (eq (car rr) 'in-buffer)
 			  (string-match (cdr rr) (buffer-name)))
-		     (if (and (eq (car rr) 'not-in-file)
+		     (when (and (eq (car rr) 'not-in-file)
 				(buffer-file-name))
-			 (not (string-match (cdr rr) (buffer-file-name)))
-		       t)
+		       (not (string-match (cdr rr) (buffer-file-name))))
 		     (when (eq (car rr) 'not-in-mode)
 		       (not (string-match (cdr rr) (symbol-name major-mode))))
 		     (when (eq (car rr) 'not-in-buffer)