To: vim-dev@vim.org Subject: Patch 6.1.192 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.192 Problem: ":diffsplit" doesn't add "hor" to 'scrollopt'. (Gary Johnson) Solution: Add "hor" to 'scrollopt' each time ":diffsplit" is used. Files: src/diff.c, src/main.c *** ../vim61.191/src/diff.c Sun Jun 30 15:59:55 2002 --- src/diff.c Fri Sep 20 22:00:07 2002 *************** *** 962,967 **** --- 962,972 ---- changed_window_setting(); /* make sure topline is not halfway a fold */ } # endif + #ifdef FEAT_SCROLLBIND + if (vim_strchr(p_sbo, 'h') == NULL) + do_cmdline_cmd("set sbo+=hor"); + #endif + if (addbuf) diff_buf_add(wp->w_buffer); redraw_win_later(wp, NOT_VALID); *** ../vim61.191/src/main.c Mon Sep 23 21:08:54 2002 --- src/main.c Fri Sep 20 22:00:52 2002 *************** *** 1184,1193 **** /* Set the 'diff' option now, so that it can be checked for in a .vimrc * file. There is no buffer yet though. */ if (diff_mode) - { diff_win_options(firstwin, FALSE); - p_sbo = (char_u *)"ver,hor,jump"; - } #endif cmdline_row = Rows - p_ch; --- 1184,1190 ---- *** ../vim61.191/src/version.c Mon Sep 23 21:08:54 2002 --- src/version.c Mon Sep 23 21:10:51 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 192, /**/ -- The technology involved in making anything invisible is so infinitely complex that nine hundred and ninety-nine billion, nine hundred and ninety-nine million, nine hundred and ninety-nine thousand, nine hundred and ninety-nine times out of a trillion it is much simpler and more effective just to take the thing away and do without it. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// 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 ///