Re: Directory completion and Initial path completion option

Re: Directory completion and Initial path completion option

[Sven Wischnowsky]

Peter Stephenson wrote:

*** Src/Zle/zle_tricky.c.dir	Mon Sep 15 16:57:36 1997
--- Src/Zle/zle_tricky.c	Mon Sep 15 17:27:39 1997
***************
*** 2635,2641 ****
  				prpre = pp;
  			    }
  			}
! 		    }
  		    /* The compctl has a glob pattern (compctl -g). */
  		    if (cc->glob) {
  			int ns, pl = strlen(prpre), o;
--- 2635,2642 ----
  				prpre = pp;
  			    }
  			}
! 		    } else if (cc->mask && CC_DIRS)
! 			gen_matches_files(1, 0, 0);
  		    /* The compctl has a glob pattern (compctl -g). */
  		    if (cc->glob) {
  			int ns, pl = strlen(prpre), o;


That should be `cc-mask & CC_DIRS'.
                       ^^^

And:

*** Src/Zle/compctl.c.withd	Mon Sep 15 18:30:40 1997
--- Src/Zle/compctl.c	Tue Sep 16 16:27:08 1997
***************
*** 280,285 ****
--- 280,298 ----
  		    *argv = "" - 1;
  		}
  		break;
+ 	    case 'W':
+ 		if ((*argv)[1]) {
+ 		    cct.withd = (*argv) + 1;
+ 		    *argv = "" - 1;
+ 		} else if (!argv[1]) {
+ 		    zwarnnam(name, "command string expected after -%c", NULL,
+ 			    **argv);
+ 		    return 1;
+ 		} else {
+ 		    cct.withd = *++argv;
+ 		    *argv = "" - 1;
+ 		}
+ 		break;
  	    case 'H':
  		if ((*argv)[1])
  		    cct.hnum = atoi((*argv) + 1);

here we probably should use "path expected after -%c".
                             ^^^^


Bye
 Sven


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

Re: Directory completion and Initial path completion option

[Peter Stephenson]

Sven Wischnowsky wrote:
> That should be `cc-mask & CC_DIRS'.
> 
> here we probably should use "path expected after -%c".

you're right, here's another additional patch (requires both previous
sets of patches).


*** Src/Zle/compctl.c~	Tue Sep 16 16:27:08 1997
--- Src/Zle/compctl.c	Wed Sep 17 15:06:37 1997
***************
*** 285,291 ****
  		    cct.withd = (*argv) + 1;
  		    *argv = "" - 1;
  		} else if (!argv[1]) {
! 		    zwarnnam(name, "command string expected after -%c", NULL,
  			    **argv);
  		    return 1;
  		} else {
--- 285,291 ----
  		    cct.withd = (*argv) + 1;
  		    *argv = "" - 1;
  		} else if (!argv[1]) {
! 		    zwarnnam(name, "path expected after -%c", NULL,
  			    **argv);
  		    return 1;
  		} else {
*** Src/Zle/zle_tricky.c~	Tue Sep 16 16:53:46 1997
--- Src/Zle/zle_tricky.c	Wed Sep 17 15:06:00 1997
***************
*** 2638,2644 ****
  				prpre = pp;
  			    }
  			}
! 		    } else if (cc->mask && CC_DIRS)
  			gen_matches_files(1, 0, 0);
  		    /* The compctl has a glob pattern (compctl -g). */
  		    if (cc->glob) {
--- 2638,2644 ----
  				prpre = pp;
  			    }
  			}
! 		    } else if (cc->mask & CC_DIRS)
  			gen_matches_files(1, 0, 0);
  		    /* The compctl has a glob pattern (compctl -g). */
  		    if (cc->glob) {

-- 
Peter Stephenson <pws@ifh.de>       Tel: +49 33762 77366
WWW:  http://www.ifh.de/~pws/       Fax: +49 33762 77413
Deutsches Elektronen-Synchrotron --- Institut fuer Hochenergiephysik Zeuthen
DESY-IfH, Platanenallee 6, 15738 Zeuthen, Germany.