To: vim-dev@vim.org Subject: Patch 6.1.285 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.285 Problem: Can't wipe out a buffer with 'bufhidden' option. Solution: Add "wipe" value to 'bufhidden'. (Yegappan Lakshmanan) Files: runtime/doc/options.txt, src/buffer.c, src/option.c, src/quickfix.c *** ../vim61.284/runtime/doc/options.txt Sun Oct 13 20:08:13 2002 --- runtime/doc/options.txt Wed Jan 8 19:29:39 2003 *************** *** 1,4 **** ! *options.txt* For Vim version 6.1. Last change: 2002 Oct 13 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *options.txt* For Vim version 6.1. Last change: 2003 Jan 08 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 947,952 **** --- 949,957 ---- delete delete the buffer from the buffer list, also when 'hidden' is set or using |:hide|, like using |:bdelete| + wipe wipe out the buffer from the buffer list, also when + 'hidden' is set or using |:hide|, like using + |:bwipeout| This option is used together with 'buftype' and 'swapfile' to specify special kinds of buffers. See |special-buffers|. *** ../vim61.284/src/buffer.c Tue Jan 7 21:09:05 2003 --- src/buffer.c Wed Jan 8 19:27:44 2003 *************** *** 285,290 **** --- 285,296 ---- { del_buf = TRUE; unload_buf = TRUE; + wipe_buf = TRUE; + } + else if (buf->b_p_bh[0] == 'w') /* 'bufhidden' == "wipe" */ + { + del_buf = TRUE; + unload_buf = TRUE; } else if (buf->b_p_bh[0] == 'u') /* 'bufhidden' == "unload" */ unload_buf = TRUE; *** ../vim61.284/src/option.c Sun Jan 5 13:29:11 2003 --- src/option.c Wed Jan 8 19:29:09 2003 *************** *** 2306,2312 **** #endif #if defined(FEAT_QUICKFIX) static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", NULL}; ! static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", NULL}; #endif static char *(p_bs_values[]) = {"indent", "eol", "start", NULL}; #ifdef FEAT_FOLDING --- 2308,2314 ---- #endif #if defined(FEAT_QUICKFIX) static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", NULL}; ! static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", "wipe", NULL}; #endif static char *(p_bs_values[]) = {"indent", "eol", "start", NULL}; #ifdef FEAT_FOLDING *** ../vim61.284/src/quickfix.c Tue Nov 19 11:21:32 2002 --- src/quickfix.c Thu Jan 9 21:47:22 2003 *************** *** 1863,1868 **** --- 1863,1869 ---- switch (buf->b_p_bh[0]) { case 'u': /* "unload" */ + case 'w': /* "wipe" */ case 'd': return FALSE; /* "delete" */ case 'h': return TRUE; /* "hide" */ } *** ../vim61.284/src/version.c Tue Jan 7 21:28:36 2003 --- src/version.c Thu Jan 9 21:44:17 2003 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 285, /**/ -- TALL KNIGHT: We are now no longer the Knights Who Say Ni! ONE KNIGHT: Ni! OTHERS: Sh! ONE KNIGHT: (whispers) Sorry. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.vim.org \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///