From 99d07e8d5e2d79c21915f1dbb8d1307a5d818b39 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 28 Nov 2017 19:58:32 -0500 Subject: Remove some bogus definition-prefixes from loaddefs * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Don't register a definition prefix from define-erc-module, which adds an erc- prefix to its argument. --- lisp/emacs-lisp/autoload.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 27426c45307..7299ae9d203 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -761,6 +761,7 @@ FILE's modification time." "def-edebug-spec" ;; Hmm... this is getting ugly: "define-widget" + "define-erc-module" "define-erc-response-handler" "defun-rcirc-command")))) (push (match-string 2) defs)) -- cgit v1.2.3 From 9964db4c34bc01b319f70983400b9820be046cf2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 29 Nov 2017 15:11:01 -0500 Subject: Restore obsolete method of changing byte-compile-dest-file * lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file): Restore seven-year obsolete feature that was removed for six months, since automake uses it. --- lisp/emacs-lisp/bytecomp.el | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e4d8a202a3b..9cbbfdcd7a9 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -172,6 +172,10 @@ are found in the same directory is hard-coded in various places in Emacs.)" (funcall handler 'byte-compiler-base-file-name filename) filename))) +;; Sadly automake relies on this misfeature up to at least version 1.15.1. +(if (fboundp 'byte-compile-dest-file) + (or (featurep 'bytecomp) + (display-warning 'bytecomp "Redefining `byte-compile-dest-file' is obsolete (as of 23.2); set `byte-compile-dest-file-function' instead.")) (defun byte-compile-dest-file (filename) "Convert an Emacs Lisp source file name to a compiled file name. If `byte-compile-dest-file-function' is non-nil, uses that @@ -186,6 +190,7 @@ otherwise adds \".elc\"." (cond ((string-match emacs-lisp-file-regexp filename) (concat (substring filename 0 (match-beginning 0)) ".elc")) (t (concat filename ".elc"))))) +) ;; This can be the 'byte-compile property of any symbol. (autoload 'byte-compile-inline-expand "byte-opt") -- cgit v1.2.3 From 408862f02a874dcd9cfc2599adb35dec522b3ef4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 29 Nov 2017 15:27:06 -0500 Subject: ; * lisp/emacs-lisp/bytecomp.el: Tweak message formatting in previous. --- lisp/emacs-lisp/bytecomp.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 9cbbfdcd7a9..e5a1ea782e8 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -175,7 +175,9 @@ are found in the same directory is hard-coded in various places in Emacs.)" ;; Sadly automake relies on this misfeature up to at least version 1.15.1. (if (fboundp 'byte-compile-dest-file) (or (featurep 'bytecomp) - (display-warning 'bytecomp "Redefining `byte-compile-dest-file' is obsolete (as of 23.2); set `byte-compile-dest-file-function' instead.")) + (display-warning 'bytecomp (format-message "\ +Changing `byte-compile-dest-file' is obsolete (as of 23.2); +set `byte-compile-dest-file-function' instead."))) (defun byte-compile-dest-file (filename) "Convert an Emacs Lisp source file name to a compiled file name. If `byte-compile-dest-file-function' is non-nil, uses that -- cgit v1.2.3