summaryrefslogtreecommitdiff
path: root/src/proto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-30 23:20:33 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-30 23:20:33 +0100
commit20fb9f346497daca4d19402fdfa5de7958642477 (patch)
treea5f484e21e755b04f4e2ab195c8aac3e8c299daa /src/proto
parentba4ef2757cfc126f342b710f1ad9ea39e6b56cec (diff)
downloadvim-git-20fb9f346497daca4d19402fdfa5de7958642477.tar.gz
patch 7.4.1217v7.4.1217
Problem: Execution of command on channel doesn't work yet. Solution: Implement the "ex" and "normal" commands.
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/channel.pro4
-rw-r--r--src/proto/ex_docmd.pro1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/proto/channel.pro b/src/proto/channel.pro
index 2d46a4963..bf3d93e5f 100644
--- a/src/proto/channel.pro
+++ b/src/proto/channel.pro
@@ -4,8 +4,7 @@ int channel_open(char *hostname, int port_in, void (*close_cb)(void));
void channel_set_json_mode(int idx, int json_mode);
void channel_set_callback(int idx, char_u *callback);
void channel_set_req_callback(int idx, char_u *callback);
-void channel_will_block(int idx);
-int channel_decode_json(char_u *msg, typval_T *tv);
+int channel_decode_json(char_u *msg, typval_T *tv1, typval_T *tv2);
int channel_is_open(int idx);
void channel_close(int idx);
int channel_save(int idx, char_u *buf, int len);
@@ -22,4 +21,5 @@ int channel_poll_setup(int nfd_in, void *fds_in);
int channel_poll_check(int ret_in, void *fds_in);
int channel_select_setup(int maxfd_in, void *rfds_in);
int channel_select_check(int ret_in, void *rfds_in);
+void channel_parse_messages(void);
/* vim: set ft=c : */
diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro
index 15e5fc5c0..0ba0fd711 100644
--- a/src/proto/ex_docmd.pro
+++ b/src/proto/ex_docmd.pro
@@ -49,6 +49,7 @@ void ex_may_print(exarg_T *eap);
int vim_mkdir_emsg(char_u *name, int prot);
FILE *open_exfile(char_u *fname, int forceit, char *mode);
void update_topline_cursor(void);
+void ex_normal(exarg_T *eap);
void exec_normal_cmd(char_u *cmd, int remap, int silent);
void exec_normal(int was_typed);
int find_cmdline_var(char_u *src, int *usedlen);