[Emacs-diffs] trunk r118061: * lisp/Makefile.in (obsolete-autoloads): Write to a separate file,

[Glenn Morris]

------------------------------------------------------------
revno: 118061
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17407
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-06 00:00:33 -0700
message:
  * lisp/Makefile.in (obsolete-autoloads): Write to a separate file,
  to workaround autoloads bug. 
  (AUTOGENEL): Add obsolete/loaddefs.el.
  
  * lisp/loadup.el: Load obsolete/loaddefs.el if present.
  
  * lisp/subr.el (do-after-load-evaluation):
  Don't warn about obsolete/loaddefs.el.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
  lisp/loadup.el                 loadup.el-20091113204419-o5vbwnq5f7feedwu-49
  lisp/subr.el                   subr.el-20091113204419-o5vbwnq5f7feedwu-151

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-06 06:30:07 +0000
+++ b/lisp/ChangeLog    2014-10-06 07:00:33 +0000
@@ -1,5 +1,12 @@
 2014-10-06  Glenn Morris  <address@hidden>
 
+       * Makefile.in (obsolete-autoloads): Write to a separate file,
+       to workaround autoloads bug.  (Bug#17407)
+       (AUTOGENEL): Add obsolete/loaddefs.el.
+       * loadup.el: Load obsolete/loaddefs.el if present.
+       * subr.el (do-after-load-evaluation):
+       Don't warn about obsolete/loaddefs.el.
+
        * menu-bar.el (menu-bar-games-menu): Remove landmark.
        It has zero relationship to a game.
 

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-09-10 16:32:36 +0000
+++ b/lisp/Makefile.in  2014-10-06 07:00:33 +0000
@@ -68,6 +68,7 @@
        cedet/semantic/loaddefs.el \
        cedet/ede/loaddefs.el \
        cedet/srecode/loaddefs.el \
+       obsolete/loaddefs.el \
        org/org-loaddefs.el
 
 # Value of max-lisp-eval-depth when compiling initially.
@@ -194,7 +195,7 @@
 obsolete-autoloads: ${lisp}/obsolete/*.el
        $(emacs) -l autoload \
            --eval '(setq generate-autoload-cookie ";;;###obsolete-autoload")' \
-           --eval '(setq generated-autoload-file (expand-file-name 
(unmsys--file-name "$(srcdir)/loaddefs.el")))' \
+           --eval '(setq generated-autoload-file (expand-file-name 
(unmsys--file-name "$(srcdir)/obsolete/loaddefs.el")))' \
            -f batch-update-autoloads ${lisp}/obsolete
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2014-10-01 22:13:11 +0000
+++ b/lisp/loadup.el    2014-10-06 07:00:33 +0000
@@ -144,6 +144,8 @@
   ;; In case loaddefs hasn't been generated yet.
   (file-error (load "ldefs-boot.el")))
 
+(load "obsolete/loaddefs.el" t)
+
 (load "emacs-lisp/nadvice")
 (load "minibuffer")
 (load "abbrev")         ;lisp-mode.el and simple.el use define-abbrev-table.

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2014-10-01 22:13:11 +0000
+++ b/lisp/subr.el      2014-10-06 07:00:33 +0000
@@ -3879,7 +3879,9 @@
       ;; discard the file name regexp
       (mapc #'funcall (cdr a-l-element))))
   ;; Complain when the user uses obsolete files.
-  (when (string-match-p "/obsolete/[^/]*\\'" abs-file)
+  (when (save-match-data
+          (and (string-match "/obsolete/\\([^/]*\\)\\'" abs-file)
+               (not (equal "loaddefs.el" (match-string 1 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!"