mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 13:33:52 +01:00
Code

Changed several instances of ZWC() used on a string to ZWS().

Browse Source
This commit is contained in:
Wayne Davison 2005-08-11 18:40:53 +00:00
parent 3f89eb7c09
commit 68f073faa2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Zle/zle_hist.c
View File

@ -864,7 +864,7 @@ get_isrch_spot(int num, int *hlp, int *posp, int *csp, int *lenp, int *dirp, int
*nomatch = (isrch_spots[num].flags & ISS_FAILING); *nomatch = (isrch_spots[num].flags & ISS_FAILING);
} }
#define ISEARCH_PROMPT ZWC("failing XXX-i-search: ") #define ISEARCH_PROMPT ZWS("failing XXX-i-search: ")
#define NORM_PROMPT_POS 8 #define NORM_PROMPT_POS 8
#define FIRST_SEARCH_CHAR (NORM_PROMPT_POS + 14) #define FIRST_SEARCH_CHAR (NORM_PROMPT_POS + 14)
@ -898,7 +898,7 @@ doisearch(char **args, int dir)
} }
ZS_strcpy(ibuf, ISEARCH_PROMPT); ZS_strcpy(ibuf, ISEARCH_PROMPT);
ZS_memcpy(ibuf + NORM_PROMPT_POS, (dir == 1) ? ZWC("fwd") : ZWC("bck"), 3); ZS_memcpy(ibuf + NORM_PROMPT_POS, (dir == 1) ? ZWS("fwd") : ZWS("bck"), 3);
remember_edits(); remember_edits();
okeymap = ztrdup(curkeymapname); okeymap = ztrdup(curkeymapname);
zletext(he, &zt); zletext(he, &zt);

6
Src/Zle/zle_refresh.c
View File

@ -594,7 +594,7 @@ zrefresh(void)
break; break;
} }
} }
ZS_strncpy(sen, ZWC(" <.... "), 7); ZS_strncpy(sen, ZWS(" <.... "), 7);
nbuf[tosln - 1][winw] = nbuf[tosln - 1][winw + 1] = ZWC('\0'); nbuf[tosln - 1][winw] = nbuf[tosln - 1][winw + 1] = ZWC('\0');
} }
@ -609,7 +609,7 @@ zrefresh(void)
break; break;
} }
} }
ZS_strncpy(sen, ZWC(" <....> "), 8); ZS_strncpy(sen, ZWS(" <....> "), 8);
nbuf[tosln][winw] = nbuf[tosln][winw + 1] = ZWC('\0'); nbuf[tosln][winw] = nbuf[tosln][winw + 1] = ZWC('\0');
} }
@ -631,7 +631,7 @@ zrefresh(void)
memset(nbuf[0], ZWC(' '), lpromptw); memset(nbuf[0], ZWC(' '), lpromptw);
t0 = winw - lpromptw; t0 = winw - lpromptw;
t0 = t0 > 5 ? 5 : t0; t0 = t0 > 5 ? 5 : t0;
ZS_strncpy(nbuf[0] + lpromptw, ZWC(">...."), t0); ZS_strncpy(nbuf[0] + lpromptw, ZWS(">...."), t0);
ZS_memset(nbuf[0] + lpromptw + t0, ZWC(' '), winw - t0 - lpromptw); ZS_memset(nbuf[0] + lpromptw + t0, ZWC(' '), winw - t0 - lpromptw);
nbuf[0][winw] = nbuf[0][winw + 1] = ZWC('\0'); nbuf[0][winw] = nbuf[0][winw + 1] = ZWC('\0');
} }