astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
5d2848e
To: vim_dev@googlegroups.com
5d2848e
Subject: Patch 7.4.805
5d2848e
Fcc: outbox
5d2848e
From: Bram Moolenaar <Bram@moolenaar.net>
5d2848e
Mime-Version: 1.0
5d2848e
Content-Type: text/plain; charset=UTF-8
5d2848e
Content-Transfer-Encoding: 8bit
5d2848e
------------
5d2848e
5d2848e
Patch 7.4.805
5d2848e
Problem:    The ruler shows "Bot" even when there are only filler lines
5d2848e
            missing. (Gary Johnson)
5d2848e
Solution:   Use "All" when the first line and one filler line are visible.
5d2848e
Files:      src/buffer.c
5d2848e
5d2848e
5d2848e
*** ../vim-7.4.804/src/buffer.c	2015-07-21 15:03:00.691467213 +0200
5d2848e
--- src/buffer.c	2015-08-04 17:38:28.340901106 +0200
5d2848e
***************
5d2848e
*** 4434,4439 ****
5d2848e
--- 4434,4443 ----
5d2848e
      above = wp->w_topline - 1;
5d2848e
  #ifdef FEAT_DIFF
5d2848e
      above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill;
5d2848e
+     if (wp->w_topline == 1 && wp->w_topfill >= 1)
5d2848e
+ 	above = 0;  /* All buffer lines are displayed and there is an
5d2848e
+ 		     * indication of filler lines, that can be considered
5d2848e
+ 		     * seeing all lines. */
5d2848e
  #endif
5d2848e
      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
5d2848e
      if (below <= 0)
5d2848e
*** ../vim-7.4.804/src/version.c	2015-08-04 17:29:02.863390617 +0200
5d2848e
--- src/version.c	2015-08-04 17:42:39.858011243 +0200
5d2848e
***************
5d2848e
*** 743,744 ****
5d2848e
--- 743,746 ----
5d2848e
  {   /* Add new patch number below this line */
5d2848e
+ /**/
5d2848e
+     805,
5d2848e
  /**/
5d2848e
5d2848e
-- 
5d2848e
Not too long ago, a keyboard was something to make music with...
5d2848e
5d2848e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
5d2848e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
5d2848e
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
5d2848e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///