From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-request@euclid.skiles.gatech.edu>
Received: (qmail 6364 invoked from network); 24 Dec 1996 11:27:34 -0000
Received: from euclid.skiles.gatech.edu (list@130.207.146.50)
  by coral.primenet.com.au with SMTP; 24 Dec 1996 11:27:34 -0000
Received: (from list@localhost) by euclid.skiles.gatech.edu (8.7.3/8.7.3) id GAA01672; Tue, 24 Dec 1996 06:28:19 -0500 (EST)
Resent-Date: Tue, 24 Dec 1996 06:28:19 -0500 (EST)
From: Zefram <zefram@dcs.warwick.ac.uk>
Message-Id: <23519.199612241129@stone.dcs.warwick.ac.uk>
Subject: printcompctlp
To: zsh-workers@math.gatech.edu (Z Shell workers mailing list)
Date: Tue, 24 Dec 1996 11:29:22 +0000 (GMT)
X-Patch: 156
X-Loop: zefram@dcs.warwick.ac.uk
X-Stardate: [-31]8622.39
X-US-Congress: Moronic fuckers
Content-Type: text
Resent-Message-ID: <"pbqbX3.0.3Q.Ivxlo"@euclid>
Resent-From: zsh-workers@math.gatech.edu
X-Mailing-List: <zsh-workers@math.gatech.edu> archive/latest/2629
X-Loop: zsh-workers@math.gatech.edu
Precedence: list
Resent-Sender: zsh-workers-request@math.gatech.edu

-----BEGIN PGP SIGNED MESSAGE-----

This patch removes some pointless conditional code from compctl and ZLE.
ZLE has no need to do compctl's work for it -- work that it then does
again anyway.  This was the last place outside init.c where any code
cared whether some other bit of code was linked in or not.

 -zefram

      *** Src/Zle/compctl.c	1996/12/22 01:13:39	1.1.1.1
      --- Src/Zle/compctl.c	1996/12/24 02:48:24
      ***************
      *** 51,60 ****
        static void cc_reassign _((Compctl cc));
        static void compctl_process_cc _((char **s, Compctl cc));
        static void printcompctl _((char *s, Compctl cc, int printflags));
      ! #ifdef MODULE
      ! static
      ! #endif
      ! void printcompctlp _((HashNode hn, int printflags));
        
        /* Parse the basic flags for `compctl' */
        
      --- 51,57 ----
        static void cc_reassign _((Compctl cc));
        static void compctl_process_cc _((char **s, Compctl cc));
        static void printcompctl _((char *s, Compctl cc, int printflags));
      ! static void printcompctlp _((HashNode hn, int printflags));
        
        /* Parse the basic flags for `compctl' */
        
      ***************
      *** 934,943 ****
            showmask = oldshowmask;
        }
        
      ! #ifdef MODULE
      ! static
      ! #endif
      ! void
        printcompctlp(HashNode hn, int printflags)
        {
            Compctlp ccp = (Compctlp) hn;
      --- 931,937 ----
            showmask = oldshowmask;
        }
        
      ! static void
        printcompctlp(HashNode hn, int printflags)
        {
            Compctlp ccp = (Compctlp) hn;
      *** Src/Zle/zle_main.c	1996/12/24 02:10:04	1.5
      --- Src/Zle/zle_main.c	1996/12/24 02:48:46
      ***************
      *** 1360,1369 ****
        /* Compctl Hash Table Functions */
        /********************************/
        
      - #ifdef LINKED_XMOD_compctl
      - void printcompctlp _((HashNode hn, int printflags));
      - #endif
      - 
        /**/
        void
        createcompctltable(void)
      --- 1360,1365 ----
      ***************
      *** 1380,1390 ****
            compctltab->disablenode = NULL;
            compctltab->enablenode  = NULL;
            compctltab->freenode    = freecompctlp;
      - #ifndef LINKED_XMOD_compctl
            compctltab->printnode   = NULL;
      - #else
      -     compctltab->printnode   = printcompctlp;
      - #endif
        }
        
        /**/
      --- 1376,1382 ----

-----BEGIN PGP SIGNATURE-----
Version: 2.6.2

iQCVAwUBMr9IpXD/+HJTpU/hAQEU4AP/WbfTzsOs6TSXorbaZ9/cNx7DGvjvkmcU
0vDJqEYVzzc6cml8lZRGGQAgf3Re/HplO/hYeNbb9IAe+ygCiqLM3qW/ML/LktEB
WOeoXjg6QaBbWTKHhf/MmaUbLK1Fr3cNGG1/IV2pvyrLR/yVaAsqjZO2wv1hkxa6
9HZbZS6splI=
=b7b+
-----END PGP SIGNATURE-----