To: vim-dev@vim.org Subject: Patch 6.1.158 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.158 Problem: "zs" and "ze" don't work correctly with ":set nowrap siso=1". (Preben Guldberg) Solution: Take 'siso' into account when computing the horizontal scroll position for "zs" and "ze". Files: src/normal.c *** ../vim61.157/src/normal.c Thu Aug 1 20:47:28 2002 --- src/normal.c Sun Aug 18 17:13:00 2002 *************** *** 4162,4167 **** --- 4162,4171 ---- else #endif getvcol(curwin, &curwin->w_cursor, &col, NULL, NULL); + if (col > p_siso) + col -= p_siso; + else + col = 0; if (curwin->w_leftcol != col) { curwin->w_leftcol = col; *************** *** 4180,4189 **** #endif getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); n = W_WIDTH(curwin) - curwin_col_off(); ! if ((long)col < n) col = 0; else ! col = col - n + 1; if (curwin->w_leftcol != col) { curwin->w_leftcol = col; --- 4184,4193 ---- #endif getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); n = W_WIDTH(curwin) - curwin_col_off(); ! if ((long)col + p_siso < n) col = 0; else ! col = col + p_siso - n + 1; if (curwin->w_leftcol != col) { curwin->w_leftcol = col; *** ../vim61.157/src/version.c Sun Aug 18 16:42:19 2002 --- src/version.c Sun Aug 18 17:17:13 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 158, /**/ -- hundred-and-one symptoms of being an internet addict: 232. You start conversations with, "Have you gotten an ISDN line?" /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///