Mercurial > vim

comparison src/channel.c @ 16912:a5e3509b33ca v8.1.1457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1457: cannot reuse a buffer when loading a screen dump commit https://github.com/vim/vim/commit/87abab92f5b42319a7b10df9974ed3ce5c9b2b9b Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 3 21:14:59 2019 +0200 patch 8.1.1457: cannot reuse a buffer when loading a screen dump Problem: Cannot reuse a buffer when loading a screen dump. Solution: Add the "bufnr" option.
author Bram Moolenaar <Bram@vim.org>
date Mon, 03 Jun 2019 21:30:05 +0200
parents a836d122231a
children 727f8cc87a45
comparison
equal deleted inserted replaced
16911:aedf7194c5a0 16912:a5e3509b33ca
4899 if (!(supported2 & JO2_CURWIN)) 4899 if (!(supported2 & JO2_CURWIN))
4900 break; 4900 break;
4901 opt->jo_set2 |= JO2_CURWIN; 4901 opt->jo_set2 |= JO2_CURWIN;
4902 opt->jo_curwin = tv_get_number(item); 4902 opt->jo_curwin = tv_get_number(item);
4903 } 4903 }
4904 else if (STRCMP(hi->hi_key, "bufnr") == 0)
4905 {
4906 int nr;
4907
4908 if (!(supported2 & JO2_CURWIN))
4909 break;
4910 opt->jo_set2 |= JO2_BUFNR;
4911 nr = tv_get_number(item);
4912 if (nr <= 0)
4913 {
4914 semsg(_(e_invargNval), hi->hi_key, tv_get_string(item));
4915 return FAIL;
4916 }
4917 opt->jo_bufnr_buf = buflist_findnr(nr);
4918 if (opt->jo_bufnr_buf == NULL)
4919 {
4920 semsg(_(e_nobufnr), (long)nr);
4921 return FAIL;
4922 }
4923 if (opt->jo_bufnr_buf->b_nwindows == 0
4924 || opt->jo_bufnr_buf->b_term == NULL)
4925 {
4926 semsg(_(e_invarg2), "bufnr");
4927 return FAIL;
4928 }
4929 }
4904 else if (STRCMP(hi->hi_key, "hidden") == 0) 4930 else if (STRCMP(hi->hi_key, "hidden") == 0)
4905 { 4931 {
4906 if (!(supported2 & JO2_HIDDEN)) 4932 if (!(supported2 & JO2_HIDDEN))
4907 break; 4933 break;
4908 opt->jo_set2 |= JO2_HIDDEN; 4934 opt->jo_set2 |= JO2_HIDDEN;