From 5766c380eec20a19844253cbb511922b6c70fc0b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 12 Sep 2009 03:35:40 +0000 Subject: [PATCH] * lread.c (Fload): Don't output a message after loading an obsolete package any more (done in Lisp now). * subr.el (do-after-load-evaluation): Warn the user after loading an obsolete package. --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 16 ++++++++++++++-- src/ChangeLog | 5 +++++ src/lread.c | 5 ----- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50aea7a570f..33d7ca2f3ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-12 Stefan Monnier + + * subr.el (do-after-load-evaluation): Warn the user after loading an + obsolete package. + 2009-09-12 Glenn Morris * proced.el (proced-mark-alt): Remove alias. diff --git a/lisp/subr.el b/lisp/subr.el index ae19a644ee1..d42382d15d3 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1688,13 +1688,25 @@ This function makes or adds to an entry on `after-load-alist'." (defun do-after-load-evaluation (abs-file) "Evaluate all `eval-after-load' forms, if any, for ABS-FILE. -ABS-FILE, a string, should be the absolute true name of a file just loaded." +ABS-FILE, a string, should be the absolute true name of a file just loaded. +This function is called directly from the C code." + ;; Run the relevant eval-after-load forms. (mapc #'(lambda (a-l-element) (when (and (stringp (car a-l-element)) (string-match-p (car a-l-element) abs-file)) ;; discard the file name regexp (mapc #'eval (cdr a-l-element)))) - after-load-alist)) + after-load-alist) + ;; Complain when the user uses obsolete files. + (when (equal "obsolete" + (file-name-nondirectory + (directory-file-name (file-name-directory abs-file)))) + (run-with-timer 0 nil + (lambda (file) + (message "Package %s is obsolete!" + (substring file 0 + (string-match "\\.elc?\\>" file)))) + (file-name-nondirectory abs-file)))) (defun eval-next-after-load (file) "Read the following input sexp, and run it whenever FILE is loaded. diff --git a/src/ChangeLog b/src/ChangeLog index ff940d6ea8b..3d3403645b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-12 Stefan Monnier + + * lread.c (Fload): Don't output a message after loading an obsolete + package any more (done in Lisp now). + 2009-09-12 Chong Yidong * fns.c (syms_of_fns): Doc fix (Bug#4227). diff --git a/src/lread.c b/src/lread.c index 10bc4ad3c5e..92b1b432acd 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1307,11 +1307,6 @@ Return t if the file exists and loads successfully. */) message_with_string ("Loading %s...done", file, 1); } - if (!NILP (Fequal (build_string ("obsolete"), - Ffile_name_nondirectory - (Fdirectory_file_name (Ffile_name_directory (found)))))) - message_with_string ("Package %s is obsolete", file, 1); - return Qt; } -- 2.39.2