Re: PATCH: more remnants of comp1

Re: PATCH: more remnants of comp1

[Sven Wischnowsky]

Adam Spiers wrote:

> Also, the INSTALL file still mentions comp1.  I'll leave this to
> someone more appropriate to fix (hi Sven, you're not busy anyway are
> you? ;-)

Well, I'm not really appropriate for this, I think, but here it is.

`grep' said that now there is no other reference to `comp1'. Apart
from the ChangeLog, of course.

Bye
 Sven

--- INSTALL.old	Tue Nov 23 11:53:55 1999
+++ INSTALL	Tue Nov 23 11:55:27 1999
@@ -66,14 +66,14 @@
 Controlling what is compiled into the main zsh binary
 -----------------------------------------------------
 
-By default the comp1, compctl, zle, complist, sched and rlimits modules are
-compiled into non-dynamic zsh and no modules are compiled into the main
-binary if dynamic loading is available.  This can be overridden by creating
-the file mymods.conf in the compilation directory (Src, unless you have
-told configure to use another directory) with the list of modules which are
-to be compiled into the main binary, one module name per line with no
-punctuation and no suffix.  See the zshmodules manual page for the list of
-available modules.
+By default the complete, compctl, zle, computil, complist, sched, parameter,
+zleparameter and rlimits modules are compiled into non-dynamic zsh and no
+modules are compiled into the main binary if dynamic loading is available.
+This can be overridden by creating the file mymods.conf in the compilation
+directory (Src, unless you have told configure to use another directory)
+with the list of modules which are to be compiled into the main binary, one
+module name per line with no punctuation and no suffix.  See the zshmodules
+manual page for the list of available modules.
 
 On systems which do not allow symbols in one dynamically loaded library to
 be visible from another, comp1 will be compiled in to the base executable

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: PATCH: more remnants of comp1

[Adam Spiers]

Sven Wischnowsky (wischnow@informatik.hu-berlin.de) wrote:
> Adam Spiers wrote:
> 
> > Also, the INSTALL file still mentions comp1.  I'll leave this to
> > someone more appropriate to fix (hi Sven, you're not busy anyway are
> > you? ;-)
> 
> Well, I'm not really appropriate for this, I think, but here it is.
> 
> `grep' said that now there is no other reference to `comp1'. Apart
> from the ChangeLog, of course.

Um, the last line of this patch suggests that comp1 is still mentioned
in INSTALL :-)

Re: PATCH: more remnants of comp1

[Sven Wischnowsky]

Adam Spiers wrote:

> Sven Wischnowsky (wischnow@informatik.hu-berlin.de) wrote:
> > Adam Spiers wrote:
> > 
> > > Also, the INSTALL file still mentions comp1.  I'll leave this to
> > > someone more appropriate to fix (hi Sven, you're not busy anyway are
> > > you? ;-)
> > 
> > Well, I'm not really appropriate for this, I think, but here it is.
> > 
> > `grep' said that now there is no other reference to `comp1'. Apart
> > from the ChangeLog, of course.
> 
> Um, the last line of this patch suggests that comp1 is still mentioned
> in INSTALL :-)

Ouch. Did that grep while changing INSTALL.

But now... (that paragraph wasn't correct any more anyway)

Bye
 Sven

--- INSTALL.old	Tue Nov 23 17:14:23 1999
+++ INSTALL	Tue Nov 23 17:21:22 1999
@@ -75,14 +75,12 @@
 module name per line with no punctuation and no suffix.  See the zshmodules
 manual page for the list of available modules.
 
-On systems which do not allow symbols in one dynamically loaded library to
-be visible from another, comp1 will be compiled in to the base executable
-when dynamic loading is used to provide a link between the compctl and zle
-modules.  However, the modules depending on zle (complist and deltochar)
-cannot be loaded dynamically on such systems; this is true, for example, of
-version 4 of SunOS.  The most convenient workaround is to compile zle into
-the base executable by including it (as well as comp1) in mymods.conf as
-described above.
+Note that the modules depending on zle or complete (e.g.: complist and
+deltochar) cannot be loaded dynamically on systems which do not allow symbols
+in one dynamically loaded library to be visible from another; this is true,
+for example, of version 4 of SunOS.  The most convenient workaround is to
+compile zle and complete into the base executable by including them in
+mymods.conf as described above.
 
 Compiler Options or Using a Different Compiler
 ----------------------------------------------

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: PATCH: more remnants of comp1

[Sven Wischnowsky]

Adam Spiers wrote:

> I notice that Src/init.c still has a #ifdef LINKED_XMOD_comp1
> in it.  Presumably this can be removed?

We then need the patch below to make compctlreadptr visible to the
compctl module.

> Also, the INSTALL file still mentions comp1.  I'll leave this to
> someone more appropriate to fix (hi Sven, you're not busy anyway are
> you? ;-)

I'll have a look.

Bye
 Sven

--- oldsrc/init.c	Tue Nov 23 10:03:00 1999
+++ Src/init.c	Tue Nov 23 10:03:16 1999
@@ -1021,6 +1021,7 @@
 
 /* compctl entry point pointers.  Similar to the ZLE ones. */
 
+/**/
 CompctlReadFn compctlreadptr = fallback_compctlread;
 
 /**/

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

PATCH: more remnants of comp1

[Adam Spiers]

I notice that Src/init.c still has a #ifdef LINKED_XMOD_comp1
in it.  Presumably this can be removed?

Also, the INSTALL file still mentions comp1.  I'll leave this to
someone more appropriate to fix (hi Sven, you're not busy anyway are
you? ;-)

Index: Src/init.c
===================================================================
RCS file: /projects/zsh/zsh/Src/init.c,v
retrieving revision 1.1.1.23
diff -u -r1.1.1.23 init.c
--- Src/init.c	1999/10/17 17:02:03	1.1.1.23
+++ Src/init.c	1999/11/23 01:51:27
@@ -1021,13 +1021,6 @@
 
 /* compctl entry point pointers.  Similar to the ZLE ones. */
 
-#ifdef LINKED_XMOD_comp1
-
-/**/
-CompctlReadFn compctlreadptr;
-
-#else /* !LINKED_XMOD_comp1 */
-
 CompctlReadFn compctlreadptr = fallback_compctlread;
 
 /**/
@@ -1038,5 +1031,3 @@
 	    NULL, 0);
     return 1;
 }
-
-#endif /* !LINKED_XMOD_comp1 */