From 62a5e890d72de11263996b25c1a7256423d22a7b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 18 May 2020 15:19:49 -0700 Subject: [PATCH] Redo RCS Id for pdumper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * lisp/version.el: Don’t put an RCS Id style string into the executable via purecopy, as this does not work with the pdumper. * src/emacs.c (RCS_Id): New constant, for 'ident'. (cherry picked from commit 3d1bcfba5e21b29be8669aa2a8f27b344c9e02fd) --- lisp/version.el | 4 ---- src/emacs.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/version.el b/lisp/version.el index 012cb2175ee..bf666cbff99 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -163,8 +163,4 @@ correspond to the running Emacs. Optional argument DIR is a directory to use instead of `source-directory'." (emacs-repository-branch-git (or dir source-directory))) -;; We put version info into the executable in the form that `ident' uses. -(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version)) - " $\n")) - ;;; version.el ends here diff --git a/src/emacs.c b/src/emacs.c index c5a760d29f6..db3e92a4773 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -124,6 +124,11 @@ static const char emacs_version[] = PACKAGE_VERSION; static const char emacs_copyright[] = COPYRIGHT; static const char emacs_bugreport[] = PACKAGE_BUGREPORT; +/* Put version info into the executable in the form that 'ident' uses. */ +char const EXTERNALLY_VISIBLE RCS_Id[] + = "$Id" ": GNU Emacs " PACKAGE_VERSION + " (" EMACS_CONFIGURATION " " EMACS_CONFIG_FEATURES ") $"; + /* Empty lisp strings. To avoid having to build any others. */ Lisp_Object empty_unibyte_string, empty_multibyte_string; -- 2.39.5