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

Patch 8.2.3289 (after 8.2.3287)
Problem:    Compiler warning for unused variable with small features.
Solution:   Rearrange #ifdefs.
Files:      src/window.c


*** ../vim-8.2.3288/src/window.c	2021-08-04 20:54:52.297882068 +0200
--- src/window.c	2021-08-04 21:15:13.450699755 +0200
***************
*** 2484,2490 ****
--- 2484,2492 ----
  #ifdef FEAT_DIFF
      int		had_diffmode = win->w_p_diff;
  #endif
+ #ifdef MESSAGE_QUEUE
      int		did_decrement = FALSE;
+ #endif
  
  #if defined(FEAT_TERMINAL) && defined(FEAT_PROP_POPUP)
      // Can close a popup window with a terminal if the job has finished.
***************
*** 2665,2671 ****
      {
  	// Pass WEE_ALLOW_PARSE_MESSAGES to decrement dont_parse_messages
  	// before autocommands.
! 	did_decrement = win_enter_ext(wp,
  		WEE_CURWIN_INVALID | WEE_TRIGGER_ENTER_AUTOCMDS
  		      | WEE_TRIGGER_LEAVE_AUTOCMDS | WEE_ALLOW_PARSE_MESSAGES);
  	if (other_buffer)
--- 2667,2678 ----
      {
  	// Pass WEE_ALLOW_PARSE_MESSAGES to decrement dont_parse_messages
  	// before autocommands.
! #ifdef MESSAGE_QUEUE
! 	did_decrement =
! #else
! 	(void)
! #endif
! 	    win_enter_ext(wp,
  		WEE_CURWIN_INVALID | WEE_TRIGGER_ENTER_AUTOCMDS
  		      | WEE_TRIGGER_LEAVE_AUTOCMDS | WEE_ALLOW_PARSE_MESSAGES);
  	if (other_buffer)
*** ../vim-8.2.3288/src/version.c	2021-08-04 21:12:48.783060069 +0200
--- src/version.c	2021-08-04 21:16:26.770517828 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3289,
  /**/

-- 
ARTHUR:    Well, it doesn't matter.  Will you go and tell your master that
           Arthur from the Court of Camelot is here.
GUARD #1:  Listen, in order to maintain air-speed velocity, a swallow
           needs to beat its wings 43 times every second, right?
ARTHUR:    Please!
                                  The Quest for the Holy Grail (Monty Python)

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