From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-request@euclid.skiles.gatech.edu>
Received: (qmail 13438 invoked from network); 1 Jun 1997 07:44:17 -0000
Received: from euclid.skiles.gatech.edu (list@130.207.146.50)
  by ns1.primenet.com.au with SMTP; 1 Jun 1997 07:44:17 -0000
Received: (from list@localhost) by euclid.skiles.gatech.edu (8.7.3/8.7.3) id DAA10275; Sun, 1 Jun 1997 03:27:09 -0400 (EDT)
Resent-Date: Sun, 1 Jun 1997 03:27:09 -0400 (EDT)
From: Zoltan Hidvegi <hzoli@ny.frontiercomm.net>
Message-Id: <199706010646.CAA09875@hzoli.home>
Subject: expand-or-complete-prefix fix
To: zsh-workers@math.gatech.edu (Zsh hacking and development)
Date: Sun, 1 Jun 1997 02:46:54 -0400 (EDT)
X-Mailer: ELM [version 2.4ME+ PL31 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Resent-Message-ID: <"7jEpO1.0.UW2.DHIap"@euclid>
Resent-From: zsh-workers@math.gatech.edu
X-Mailing-List: <zsh-workers@math.gatech.edu> archive/latest/3183
X-Loop: zsh-workers@math.gatech.edu
Precedence: list
Resent-Sender: zsh-workers-request@math.gatech.edu

This patch should fix expand-or-complete-prefix in zsh-3.1.2-test1.

Zoltan


*** Src/Zle/zle_tricky.c	1997/06/01 06:13:15	3.1.2.12
--- Src/Zle/zle_tricky.c	1997/06/01 06:42:50
***************
*** 3850,3872 ****
      int m = zmult;
  
      /* insert a space and backspace. */
      c = ' ';
      selfinsert();		/* insert the extra character */
!     forwardchar();		/* move towards beginning */
      
      remove_at = cs;
  
      /* do the expansion/completion. */
      c = csafe;
-     zmult = 1;
      expandorcomplete();		/* complete. */
-     zmult = -1;
  
      /* remove the inserted space. */
!     if (remove_at >= 0) {
! 	backwardchar();		/* move towards ends */
  	deletechar();		/* delete the added space. */
-     }
      zmult = m;
      remove_at = -1;
  }
--- 3850,3869 ----
      int m = zmult;
  
      /* insert a space and backspace. */
+     zmult = 1;
      c = ' ';
      selfinsert();		/* insert the extra character */
!     backwardchar();		/* move towards beginning */
      
      remove_at = cs;
  
      /* do the expansion/completion. */
      c = csafe;
      expandorcomplete();		/* complete. */
  
      /* remove the inserted space. */
!     if (remove_at >= 0)
  	deletechar();		/* delete the added space. */
      zmult = m;
      remove_at = -1;
  }