diff options
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/iwidgets.list | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_hist.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Src/Zle/iwidgets.list b/Src/Zle/iwidgets.list index fbd45dacc..36d0cf396 100644 --- a/Src/Zle/iwidgets.list +++ b/Src/Zle/iwidgets.list @@ -56,7 +56,7 @@ "expand-word", expandword, 0 "forward-char", forwardchar, 0 "forward-word", forwardword, 0 -"get-line", getline, 0 +"get-line", zgetline, 0 "gosmacs-transpose-chars", gosmacstransposechars, 0 "history-beginning-search-backward", historybeginningsearchbackward, 0 "history-beginning-search-forward", historybeginningsearchforward, 0 diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c index 1c17defc7..b24db660c 100644 --- a/Src/Zle/zle_hist.c +++ b/Src/Zle/zle_hist.c @@ -660,9 +660,10 @@ pushinput(char **args) return ret; } +/* Renamed to avoid clash with library function */ /**/ int -getline(char **args) +zgetline(char **args) { char *s = (char *)getlinknode(bufstack); |