From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 13 Apr 2015 14:41:30 +0000 (-0400)
Subject: Remove left over code from when we used an obsolete/loaddefs.el file
X-Git-Tag: emacs-25.0.90~2449
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2f9da45c4f49918d100627ce0198cd593a0bf15;p=emacs.git

Remove left over code from when we used an obsolete/loaddefs.el file

* lisp/subr.el (do-after-load-evaluation): Remove left over code from when
we used an obsolete/loaddefs.el file.
---

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."
       ;; discard the file name regexp
       (mapc #'funcall (cdr a-l-element))))
   ;; Complain when the user uses obsolete files.
-  (when (save-match-data
-          (and (string-match "/obsolete/\\([^/]*\\)\\'" abs-file)
-               (not (equal "loaddefs.el" (match-string 1 abs-file)))))
+  (when (string-match-p "/obsolete/\\([^/]*\\)\\'" abs-file)
     ;; Maybe we should just use display-warning?  This seems yucky...
     (let* ((file (file-name-nondirectory abs-file))
 	   (msg (format "Package %s is obsolete!"