(byte-compile-insert-header):

When using dynamic docstrings, refuse to load in 19.28 and older.
In that error message, don't mention the directory names.

1 files changed, 9 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ea3ceb4ed81..9fadfc53748 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1401,11 +1401,16 @@ With argument, insert value in current buffer after the form."
               ;; in files loaded early in loadup.el.
               "\n(if (and (boundp 'emacs-version)\n"
               "\t (or (and (boundp 'epoch::version) epoch::version)\n"
-              "\t     (string-lessp emacs-version \"19\")))\n"
+              (if byte-compile-dynamic-docstrings
+                  "\t     (string-lessp emacs-version \"19.28.90\")))\n"
+                "\t     (string-lessp emacs-version \"19\")))\n")
               "    (error \"`"
-              ;; This escapes all backslashes in FILENAME.  Needed on Windows.
-              (substring (prin1-to-string filename) 1 -1)
-              "' was compiled for Emacs 19\"))\n\n"
+              ;; prin1-to-string is used to quote backslashes.
+              (substring (prin1-to-string (file-name-nondirectory filename))
+                         1 -1)
+              (if byte-compile-dynamic-docstrings
+                  "' was compiled for Emacs 19.29 or later\"))\n\n"
+                "' was compiled for Emacs 19\"))\n\n")
               )))