aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/subr.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 3b536f2e7d6..03d12fec2a9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3943,9 +3943,7 @@ This function is called directly from the C code."
3943 ;; discard the file name regexp 3943 ;; discard the file name regexp
3944 (mapc #'funcall (cdr a-l-element)))) 3944 (mapc #'funcall (cdr a-l-element))))
3945 ;; Complain when the user uses obsolete files. 3945 ;; Complain when the user uses obsolete files.
3946 (when (save-match-data 3946 (when (string-match-p "/obsolete/\\([^/]*\\)\\'" abs-file)
3947 (and (string-match "/obsolete/\\([^/]*\\)\\'" abs-file)
3948 (not (equal "loaddefs.el" (match-string 1 abs-file)))))
3949 ;; Maybe we should just use display-warning? This seems yucky... 3947 ;; Maybe we should just use display-warning? This seems yucky...
3950 (let* ((file (file-name-nondirectory abs-file)) 3948 (let* ((file (file-name-nondirectory abs-file))
3951 (msg (format "Package %s is obsolete!" 3949 (msg (format "Package %s is obsolete!"