[Emacs-diffs] master 233cfb0: Remove obsolete method of changing byte-compile-dest-file

[Glenn Morris]

branch: master
commit 233cfb0ea93ecdd2b63298be4243059e2e7a91fd
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Remove obsolete method of changing byte-compile-dest-file
    
    * lisp/emacs-lisp/bytecomp.el (byte-compile-dest-file):
    Define unconditionally.
---
 lisp/emacs-lisp/bytecomp.el | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2510254..201733f 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -166,24 +166,19 @@ file name, and return the name of the compiled file."
        (funcall handler 'byte-compiler-base-file-name filename)
       filename)))
 
-(or (fboundp 'byte-compile-dest-file)
-    ;; The user may want to redefine this along with emacs-lisp-file-regexp,
-    ;; so only define it if it is undefined.
-    ;; Note - redefining this function is obsolete as of 23.2.
-    ;; Customize byte-compile-dest-file-function instead.
-    (defun byte-compile-dest-file (filename)
-      "Convert an Emacs Lisp source file name to a compiled file name.
+(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
 function to do the work.  Otherwise, if FILENAME matches
 `emacs-lisp-file-regexp' (by default, files with the extension `.el'),
 adds `c' to it; otherwise adds `.elc'."
-      (if byte-compile-dest-file-function
-         (funcall byte-compile-dest-file-function filename)
-       (setq filename (file-name-sans-versions
-                       (byte-compiler-base-file-name filename)))
-       (cond ((string-match emacs-lisp-file-regexp filename)
-              (concat (substring filename 0 (match-beginning 0)) ".elc"))
-             (t (concat filename ".elc"))))))
+  (if byte-compile-dest-file-function
+      (funcall byte-compile-dest-file-function filename)
+    (setq filename (file-name-sans-versions
+                   (byte-compiler-base-file-name filename)))
+    (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")