Commit 87666a05 authored by Glenn Morris's avatar Glenn Morris
Browse files

* 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.

Fixes: debbugs:17407
parent 102c5a37
2014-10-06 Glenn Morris <rgm@gnu.org>
 
* 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.
 
......
......@@ -68,6 +68,7 @@ AUTOGENEL = loaddefs.el \
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 @@ autoloads: $(LOADDEFS)
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
......
......@@ -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.
......
......@@ -3879,7 +3879,9 @@ 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 (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!"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment