To: vim_dev@googlegroups.com Subject: Patch 9.0.0290 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0290 Problem: Compiler warning for variable set but not used. Solution: Add #ifdef. Files: src/message.c *** ../vim-9.0.0289/src/message.c 2022-08-27 21:52:48.671605945 +0100 --- src/message.c 2022-08-27 22:03:35.867038465 +0100 *************** *** 1459,1464 **** --- 1459,1465 ---- } #endif + #ifdef HAS_MESSAGE_WINDOW if (use_message_window()) { if (popup_message_win_visible() && msg_col > 0) *************** *** 1472,1478 **** } msg_col = 0; } ! else if (!msg_scroll && full_screen) // overwrite last message { msg_row = cmdline_row; msg_col = --- 1473,1481 ---- } msg_col = 0; } ! else ! #endif ! if (!msg_scroll && full_screen) // overwrite last message { msg_row = cmdline_row; msg_col = *************** *** 2302,2309 **** int sb_col = msg_col; int wrap; int did_last_char; - int where = PUT_APPEND; #ifdef HAS_MESSAGE_WINDOW win_T *msg_win = NULL; linenr_T lnum = 1; --- 2305,2312 ---- int sb_col = msg_col; int wrap; int did_last_char; #ifdef HAS_MESSAGE_WINDOW + int where = PUT_APPEND; win_T *msg_win = NULL; linenr_T lnum = 1; *************** *** 2513,2519 **** --- 2516,2524 ---- else if (*s == '\r') // go to column 0 { msg_col = 0; + #ifdef HAS_MESSAGE_WINDOW where = PUT_TRUNC; + #endif } else if (*s == '\b') // go to previous char { *** ../vim-9.0.0289/src/version.c 2022-08-27 21:52:48.671605945 +0100 --- src/version.c 2022-08-27 22:01:24.307129448 +0100 *************** *** 709,710 **** --- 709,712 ---- { /* Add new patch number below this line */ + /**/ + 290, /**/ -- FROG: How you English say: I one more time, mac, I unclog my nose towards you, sons of a window-dresser, so, you think you could out-clever us French fellows with your silly knees-bent creeping about advancing behaviour. (blows a raspberry) I wave my private parts at your aunties, you brightly-coloured, mealy-templed, cranberry-smelling, electric donkey-bottom biters. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///