Mercurial > vim
changeset 13501:a4a559e08798 v8.0.1624
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
commit https://github.com/vim/vim/commit/5a3a49ed592e8300553590392721a5e55fede6e7
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 20 18:35:53 2018 +0100
patch 8.0.1624: options for term_dumpdiff() and term_dumpload() not implemented
Problem: Options for term_dumpdiff() and term_dumpload() not implemented
yet.
Solution: Implement the relevant options.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 20 Mar 2018 18:45:07 +0100 |
| parents | 8579d5f3da4b |
| children | 4e5d34df2740 |
| files | runtime/doc/eval.txt src/terminal.c src/version.c |
| diffstat | 3 files changed, 45 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.0. Last change: 2018 Mar 18 +*eval.txt* For Vim version 8.0. Last change: 2018 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -8190,7 +8190,20 @@ term_dumpdiff({filename}, {filename} [, the second file. The middle part shows the differences. The parts are separated by a line of dashes. - {options} are not implemented yet. + If the {options} argument is present, it must be a Dict with + these possible members: + "term_name" name to use for the buffer name, instead + of the first file name. + "term_rows" vertical size to use for the terminal, + instead of using 'termsize' + "term_cols" horizontal size to use for the terminal, + instead of using 'termsize' + "vertical" split the window vertically + "curwin" use the current window, do not split the + window; fails if the current buffer + cannot be |abandon|ed + "norestore" do not add the terminal window to a + session file Each character in the middle part indicates a difference. If there are multiple differences only the first in this list is @@ -8213,7 +8226,7 @@ term_dumpload({filename} [, {options}]) Returns the buffer number or zero when it fails. Also see |terminal-diff|. - {options} are not implemented yet. + For {options} see |term_dumpdiff()|. *term_dumpwrite()* term_dumpwrite({buf}, {filename} [, {options}]) @@ -9237,7 +9250,7 @@ visualextra Compiled with extra Visual vms VMS version of Vim. vreplace Compiled with |gR| and |gr| commands. vtp Compiled for vcon support |+vtp| (check vcon to find - out if it works in the current console)). + out if it works in the current console). wildignore Compiled with 'wildignore' option. wildmenu Compiled with 'wildmenu' option. win32 Win32 version of Vim (MS-Windows 95 and later, 32 or
--- a/src/terminal.c +++ b/src/terminal.c @@ -342,6 +342,7 @@ term_start( buf_T *old_curbuf = NULL; int res; buf_T *newbuf; + int vertical = opt->jo_vertical || (cmdmod.split & WSP_VERT); if (check_restricted() || check_secure()) return NULL; @@ -411,17 +412,19 @@ term_start( split_ea.cmdidx = CMD_new; split_ea.cmd = (char_u *)"new"; split_ea.arg = (char_u *)""; - if (opt->jo_term_rows > 0 && !(cmdmod.split & WSP_VERT)) + if (opt->jo_term_rows > 0 && !vertical) { split_ea.line2 = opt->jo_term_rows; split_ea.addr_count = 1; } - if (opt->jo_term_cols > 0 && (cmdmod.split & WSP_VERT)) + if (opt->jo_term_cols > 0 && vertical) { split_ea.line2 = opt->jo_term_cols; split_ea.addr_count = 1; } + if (vertical) + cmdmod.split |= WSP_VERT; ex_splitview(&split_ea); if (curwin == old_curwin) { @@ -437,11 +440,9 @@ term_start( { /* Only one size was taken care of with :new, do the other one. With * "curwin" both need to be done. */ - if (opt->jo_term_rows > 0 && (opt->jo_curwin - || (cmdmod.split & WSP_VERT))) + if (opt->jo_term_rows > 0 && (opt->jo_curwin || vertical)) win_setheight(opt->jo_term_rows); - if (opt->jo_term_cols > 0 && (opt->jo_curwin - || !(cmdmod.split & WSP_VERT))) + if (opt->jo_term_cols > 0 && (opt->jo_curwin || !vertical)) win_setwidth(opt->jo_term_cols); } @@ -3732,6 +3733,7 @@ term_load_dump(typval_T *argvars, typval char_u buf2[NUMBUFLEN]; char_u *fname1; char_u *fname2 = NULL; + char_u *fname_tofree = NULL; FILE *fd1; FILE *fd2 = NULL; char_u *textline = NULL; @@ -3763,10 +3765,23 @@ term_load_dump(typval_T *argvars, typval } init_job_options(&opt); - /* TODO: use the {options} argument */ - - /* TODO: use the file name arguments for the buffer name */ - opt.jo_term_name = (char_u *)"dump diff"; + if (argvars[do_diff ? 2 : 1].v_type != VAR_UNKNOWN + && get_job_options(&argvars[do_diff ? 2 : 1], &opt, 0, + JO2_TERM_NAME + JO2_TERM_COLS + JO2_TERM_ROWS + + JO2_VERTICAL + JO2_CURWIN + JO2_NORESTORE) == FAIL) + goto theend; + + if (opt.jo_term_name == NULL) + { + int len = STRLEN(fname1) + 12; + + fname_tofree = alloc(len); + if (fname_tofree != NULL) + { + vim_snprintf((char *)fname_tofree, len, "dump diff %s", fname1); + opt.jo_term_name = fname_tofree; + } + } buf = term_start(&argvars[0], NULL, &opt, TERM_START_NOJOB); if (buf != NULL && buf->b_term != NULL) @@ -3937,6 +3952,7 @@ term_load_dump(typval_T *argvars, typval theend: vim_free(textline); + vim_free(fname_tofree); fclose(fd1); if (fd2 != NULL) fclose(fd2); @@ -4541,8 +4557,6 @@ f_term_start(typval_T *argvars, typval_T + JO2_NORESTORE + JO2_TERM_KILL) == FAIL) return; - if (opt.jo_vertical) - cmdmod.split = WSP_VERT; buf = term_start(&argvars[0], NULL, &opt, 0); if (buf != NULL && buf->b_term != NULL)