[Emacs-diffs] emacs lisp/ChangeLog lisp/subr.el src/ChangeLog...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/12 03:35:45

Modified files:
        lisp           : ChangeLog subr.el 
        src            : ChangeLog lread.c 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16143&r2=1.16144
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.650&r2=1.651
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7744&r2=1.7745
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lread.c?cvsroot=emacs&r1=1.412&r2=1.413

Patches:
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16143
retrieving revision 1.16144
diff -u -b -r1.16143 -r1.16144
--- lisp/ChangeLog      12 Sep 2009 02:42:22 -0000      1.16143
+++ lisp/ChangeLog      12 Sep 2009 03:35:40 -0000      1.16144
@@ -1,3 +1,8 @@
+2009-09-12  Stefan Monnier  <address@hidden>
+
+       * subr.el (do-after-load-evaluation): Warn the user after loading an
+       obsolete package.
+
 2009-09-12  Glenn Morris  <address@hidden>
 
        * proced.el (proced-mark-alt): Remove alias.

Index: lisp/subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -b -r1.650 -r1.651
--- lisp/subr.el        10 Sep 2009 18:19:06 -0000      1.650
+++ lisp/subr.el        12 Sep 2009 03:35:43 -0000      1.651
@@ -1688,13 +1688,25 @@
 
 (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.

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7744
retrieving revision 1.7745
diff -u -b -r1.7744 -r1.7745
--- src/ChangeLog       12 Sep 2009 01:30:51 -0000      1.7744
+++ src/ChangeLog       12 Sep 2009 03:35:43 -0000      1.7745
@@ -1,3 +1,8 @@
+2009-09-12  Stefan Monnier  <address@hidden>
+
+       * lread.c (Fload): Don't output a message after loading an obsolete
+       package any more (done in Lisp now).
+
 2009-09-12  Chong Yidong  <address@hidden>
 
        * fns.c (syms_of_fns): Doc fix (Bug#4227).

Index: src/lread.c
===================================================================
RCS file: /sources/emacs/emacs/src/lread.c,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -b -r1.412 -r1.413
--- src/lread.c 5 Sep 2009 00:45:08 -0000       1.412
+++ src/lread.c 12 Sep 2009 03:35:44 -0000      1.413
@@ -1307,11 +1307,6 @@
        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;
 }