From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 18 May 2020 22:19:49 +0000 (-0700)
Subject: Redo RCS Id for pdumper
X-Git-Tag: emacs-27.1-rc1~117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62a5e890d72de11263996b25c1a7256423d22a7b;p=emacs.git

Redo RCS Id for pdumper

* 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)
---

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;