patch: M-x emacs-version

patch: M-x emacs-version

[Kalle Olavi Niemitalo]

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 
=================================================================

Re: patch: M-x emacs-version

[Keisuke Nishida]

Kalle Olavi Niemitalo <tosi@ees2.oulu.fi> writes:

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

Sounds good.  I think `guile' is a better name as a feature.
We can remove the line "(provide 'guile)" from guile.scm and
provide a Lisp function `use-scheme-module' or something.

> 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?

OK, I did it.  Individual files are now available via CVS by
typing "cvs update -d".

2000-03-21  Keisuke Nishida  <kxn30@po.cwru.edu>

	* Now the `src' subdirectory contains original emacs source files
	and our patched version.  If we want to make a patch to Emacs,
	we should do this first:

	  1. Copy the original file to an appropriate directory.
	  2. Commit it with the revision 1.1 and the tag `emacs_20_6'
	     (or whatever if the patch is for other than Emacs 20.6).
	  3. Modify the file as we like and commit it as always.

	Then we can create a patch by typing this:

	  % cd src/emacs-20.6; cvs diff -c -r emacs_20_6 > emacs-20.6.patch

	* src/emacs-20.6/lisp/startup.el, src/emacs-20.6/lisp/version.el,
	src/emacs-20.6/src/Makefile.in, src/emacs-20.6/src/guileapi.c
	src/emacs-20.6/src/alloc.c, src/emacs-20.6/src/lisp.h
	src/emacs-20.6/src/emacs.c, src/emacs-20.6/src/print.c: New files.

Could you commit your patch by yourself?  I'm not sure whether we
should include this subdirectory in a archive instead of a patch.

Re: patch: M-x emacs-version

[Kalle Olavi Niemitalo]

Keisuke Nishida <kxn30@po.cwru.edu> writes:

> Sounds good.  I think `guile' is a better name as a feature.
> We can remove the line "(provide 'guile)" from guile.scm

I can do that.

> and provide a Lisp function `use-scheme-module' or something.

This could be made part of `require': if the required feature is
a list, it would be interpreted as a Scheme module name.  Perhaps
that is a bad idea; it would overload the meaning of a primitive.

> Could you commit your patch by yourself?

OK.

> I'm not sure whether we should include this subdirectory in a
> archive instead of a patch.

Sorry, I don't quite understand.  Do you mean the src
subdirectory and guile-emacs-*.tar.gz archives?  If so, I think
it is not useful there.

I hope it will be easier to use guile-emacs with non-20.6
versions of Emacs if the tar.gz contains either the patch or a
way to generate it.  Files in the src directory don't help with
this: to generate the patch from them, one also needs the
emacs-20.6 source which may not be available when emacs-20.9 is
current.

Re: patch: M-x emacs-version

[Keisuke Nishida]

Kalle Olavi Niemitalo <tosi@ees2.oulu.fi> writes:

> > and provide a Lisp function `use-scheme-module' or something.
> 
> This could be made part of `require': if the required feature is
> a list, it would be interpreted as a Scheme module name.  Perhaps
> that is a bad idea; it would overload the meaning of a primitive.

I guess we will use a whole new package management system in the future,
so we don't need to care about this too much for the moment.

> > I'm not sure whether we should include this subdirectory in a
> > archive instead of a patch.
> 
> Sorry, I don't quite understand.  Do you mean the src
> subdirectory and guile-emacs-*.tar.gz archives?  If so, I think
> it is not useful there.

Yes, that's what I meant.

> I hope it will be easier to use guile-emacs with non-20.6
> versions of Emacs if the tar.gz contains either the patch or a
> way to generate it.  Files in the src directory don't help with
> this: to generate the patch from them, one also needs the
> emacs-20.6 source which may not be available when emacs-20.9 is
> current.

That's right.  I'll provide the patch with tarball, while maintain
the src directory in the CVS repository.  We could add more patches
by creating subdirectories for other Emacsen.