diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-11-29 17:12:56 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-11-29 17:12:56 -0800 |
| commit | f069ea4f84a94bfbbd444073729f81fdd27c9445 (patch) | |
| tree | 6adf14a7d71264bb20c87a426df6e18e0edba9a3 /lisp/emacs-lisp | |
| parent | 03e1012be4028e653bd88c93846b17172b5c0faa (diff) | |
| parent | 408862f02a874dcd9cfc2599adb35dec522b3ef4 (diff) | |
| download | emacs-f069ea4f84a94bfbbd444073729f81fdd27c9445.tar.gz emacs-f069ea4f84a94bfbbd444073729f81fdd27c9445.tar.bz2 emacs-f069ea4f84a94bfbbd444073729f81fdd27c9445.zip | |
Merge from origin/emacs-26
408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 7 |
2 files changed, 8 insertions, 0 deletions
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)) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e4d8a202a3b..e5a1ea782e8 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -172,6 +172,12 @@ 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 (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 @@ -186,6 +192,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") |