From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kalle Olavi Niemitalo <tosi@stekt.oulu.fi>
To: guile-emacs@sourceware.cygnus.com
Subject: patch: M-x emacs-version
Date: Mon, 20 Mar 2000 20:54:00 -0000
Message-id: <87k8ixftez.fsf@PC486.Niemitalo.LAN>
X-SW-Source: 2000-q1/msg00046.html

I have patched `features' and `emacs-version' as suggested in
TODO; however, I called the feature `guile-emacs' because `guile'
is already used by guile.scm.  (Perhaps modules shouldn't provide
features because Guile already keeps track of them.)

I didn't format this as a patch to a emacs-20.6.patch because the
header lines ("retrieving revision"...) wouldn't have matched
anyway.  Could we keep both original and modified Emacs files in
the package and generate the patch automatically somehow?

This change is not in CVS.

2000-03-20  Kalle Olavi Niemitalo  <tosi@stekt.oulu.fi>

	* src/guileapi.c (init_guileapi): Provide guile-emacs.
	* lisp/version.el: If guile-emacs is provided, say so.

=================================================================
diff -ur emacs-20.5+guile/src/guileapi.c emacs-20.5+guile+kon/src/guileapi.c
--- emacs-20.5+guile/src/guileapi.c	Mon Mar 20 19:01:19 2000
+++ emacs-20.5+guile+kon/src/guileapi.c	Mon Mar 20 13:07:53 2000
@@ -349,4 +349,5 @@
 					 NULL, lispref_free,
 					 lispref_print, lispref_equal);
 #include "guileapi.x"
+  Fprovide (intern ("guile-emacs"));
 }
diff -ur emacs-20.5+guile/lisp/version.el emacs-20.5+guile+kon/lisp/version.el
--- emacs-20.5+guile/lisp/version.el	Fri Dec  3 09:35:23 1999
+++ emacs-20.5+guile+kon/lisp/version.el	Mon Mar 20 15:29:09 2000
@@ -52,13 +52,14 @@
   (interactive "P")
   (let ((version-string 
          (format (if (not (interactive-p))
-		     "GNU Emacs %s (%s%s)\n of %s on %s"
-		   "GNU Emacs %s (%s%s) of %s on %s")
+		     "GNU Emacs %s (%s%s%s)\n of %s on %s"
+		   "GNU Emacs %s (%s%s%s) of %s on %s")
                  emacs-version
 		 system-configuration
 		 (cond ((featurep 'motif) ", Motif")
 		       ((featurep 'x-toolkit) ", X toolkit")
 		       (t ""))
+		 (if (featurep 'guile-emacs) ", Guile" "")
 		 (format-time-string "%a %b %e %Y" emacs-build-time)
                  emacs-build-system)))
     (if here 
=================================================================