To: vim_dev@googlegroups.com
Subject: Patch 7.4.1615
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1615
Problem:    Build fails with tiny features.
Solution:   Adjust #ifdefs.
Files:      src/normal.c, src/window.c


*** ../vim-7.4.1614/src/normal.c	2016-03-19 22:11:47.428674921 +0100
--- src/normal.c	2016-03-19 22:57:10.731337826 +0100
***************
*** 2780,2786 ****
--- 2780,2788 ----
  			oap == NULL ? NULL : &(oap->inclusive), which_button);
      moved = (jump_flags & CURSOR_MOVED);
      in_status_line = (jump_flags & IN_STATUS_LINE);
+ #ifdef FEAT_WINDOWS
      in_sep_line = (jump_flags & IN_SEP_LINE);
+ #endif
  
  #ifdef FEAT_NETBEANS_INTG
      if (isNetbeansBuffer(curbuf)
***************
*** 3016,3021 ****
--- 3018,3024 ----
  	}
  #endif
      }
+ #ifdef FEAT_WINDOWS
      else if (in_sep_line)
      {
  # ifdef FEAT_MOUSESHAPE
***************
*** 3026,3031 ****
--- 3029,3035 ----
  	}
  # endif
      }
+ #endif
      else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
  	     && mouse_has(MOUSE_VISUAL))
      {
*** ../vim-7.4.1614/src/window.c	2016-03-19 22:11:47.436674835 +0100
--- src/window.c	2016-03-19 22:58:52.242237252 +0100
***************
*** 3446,3452 ****
--- 3446,3454 ----
      if (curwin->w_frame == NULL)
  	return FAIL;
      topframe = curwin->w_frame;
+ #ifdef FEAT_WINDOWS
      topframe->fr_width = Columns;
+ #endif
      topframe->fr_height = Rows - p_ch;
      topframe->fr_win = curwin;
  
***************
*** 3477,3484 ****
--- 3479,3488 ----
  {
      firstwin->w_height = ROWS_AVAIL;
      topframe->fr_height = ROWS_AVAIL;
+ #ifdef FEAT_WINDOWS
      firstwin->w_width = Columns;
      topframe->fr_width = Columns;
+ #endif
  }
  
  #if defined(FEAT_WINDOWS) || defined(PROTO)
***************
*** 4468,4476 ****
  #ifdef FEAT_WINDOWS
      if (!hidden)
  	win_append(after, new_wp);
- #endif
      new_wp->w_wincol = 0;
      new_wp->w_width = Columns;
  
      /* position the display and the cursor at the top of the file. */
      new_wp->w_topline = 1;
--- 4472,4480 ----
  #ifdef FEAT_WINDOWS
      if (!hidden)
  	win_append(after, new_wp);
      new_wp->w_wincol = 0;
      new_wp->w_width = Columns;
+ #endif
  
      /* position the display and the cursor at the top of the file. */
      new_wp->w_topline = 1;
*** ../vim-7.4.1614/src/version.c	2016-03-19 22:53:54.233469360 +0100
--- src/version.c	2016-03-19 23:07:07.256916803 +0100
***************
*** 750,751 ****
--- 750,753 ----
  {   /* Add new patch number below this line */
+ /**/
+     1615,
  /**/

-- 
Where do you want to crash today?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///