To: vim_dev@googlegroups.com Subject: Patch 9.0.0919 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0919 (after 9.0.0917) Problem: Build failure with tiny features. Solution: Adjust #ifdef's. Files: src/window.c *** ../vim-9.0.0918/src/window.c 2022-11-22 12:40:44.062427876 +0000 --- src/window.c 2022-11-22 13:28:29.474829395 +0000 *************** *** 2872,2877 **** --- 2872,2878 ---- } } + #ifdef FEAT_EVAL /* * Create a dictionary with information about size and scroll changes in a * window. *************** *** 2918,2923 **** --- 2919,2925 ---- dict_unref(d); return NULL; } + #endif // Return values of check_window_scroll_resize(): #define CWSR_SCROLLED 1 // at least one window scrolled *************** *** 2945,2960 **** int *size_count, win_T **first_scroll_win, win_T **first_size_win, ! list_T *winlist, ! dict_T *v_event) { int result = 0; int listidx = 0; int tot_width = 0; int tot_height = 0; int tot_topline = 0; int tot_leftcol = 0; int tot_skipcol = 0; win_T *wp; FOR_ALL_WINDOWS(wp) --- 2947,2964 ---- int *size_count, win_T **first_scroll_win, win_T **first_size_win, ! list_T *winlist UNUSED, ! dict_T *v_event UNUSED) { int result = 0; + #ifdef FEAT_EVAL int listidx = 0; int tot_width = 0; int tot_height = 0; int tot_topline = 0; int tot_leftcol = 0; int tot_skipcol = 0; + #endif win_T *wp; FOR_ALL_WINDOWS(wp) *************** *** 2964,2969 **** --- 2968,2974 ---- if (size_changed) { result |= CWSR_RESIZED; + #ifdef FEAT_EVAL if (winlist != NULL) { // Add this window to the list of changed windows. *************** *** 2973,2979 **** tv.vval.v_number = wp->w_id; list_set_item(winlist, listidx++, &tv); } ! else if (size_count != NULL) { ++*size_count; if (*first_size_win == NULL) --- 2978,2986 ---- tv.vval.v_number = wp->w_id; list_set_item(winlist, listidx++, &tv); } ! else ! #endif ! if (size_count != NULL) { ++*size_count; if (*first_size_win == NULL) *************** *** 2995,3000 **** --- 3002,3008 ---- *first_scroll_win = wp; } + #ifdef FEAT_EVAL if ((size_changed || scroll_changed) && v_event != NULL) { // Add info about this window to the v:event dictionary. *************** *** 3022,3029 **** --- 3030,3039 ---- tot_leftcol += abs(leftcol); tot_skipcol += abs(skipcol); } + #endif } + #ifdef FEAT_EVAL if (v_event != NULL) { dict_T *alldict = make_win_info_dict(tot_width, tot_height, *************** *** 3036,3041 **** --- 3046,3052 ---- --alldict->dv_refcount; } } + #endif return result; } *************** *** 3067,3073 **** int trigger_scroll = do_scroll && cwsr != 0; if (!trigger_resize && !trigger_scroll) return; // no relevant changes ! list_T *windows_list = NULL; if (trigger_resize) { --- 3078,3084 ---- int trigger_scroll = do_scroll && cwsr != 0; if (!trigger_resize && !trigger_scroll) return; // no relevant changes ! #ifdef FEAT_EVAL list_T *windows_list = NULL; if (trigger_resize) { *************** *** 3088,3093 **** --- 3099,3105 ---- scroll_dict); } } + #endif // WinScrolled/WinResized are triggered only once, even when multiple // windows scrolled or changed size. Store the current values before *************** *** 3103,3126 **** // If both are to be triggered do WinResized first. if (trigger_resize) { save_v_event_T save_v_event; dict_T *v_event = get_v_event(&save_v_event); if (dict_add_list(v_event, "windows", windows_list) == OK) { dict_set_items_ro(v_event); ! char_u winid[NUMBUFLEN]; vim_snprintf((char *)winid, sizeof(winid), "%d", first_size_win->w_id); apply_autocmds(EVENT_WINRESIZED, winid, winid, FALSE, first_size_win->w_buffer); } restore_v_event(v_event, &save_v_event); } if (trigger_scroll) { save_v_event_T save_v_event; dict_T *v_event = get_v_event(&save_v_event); --- 3115,3142 ---- // If both are to be triggered do WinResized first. if (trigger_resize) { + #ifdef FEAT_EVAL save_v_event_T save_v_event; dict_T *v_event = get_v_event(&save_v_event); if (dict_add_list(v_event, "windows", windows_list) == OK) { dict_set_items_ro(v_event); ! #endif char_u winid[NUMBUFLEN]; vim_snprintf((char *)winid, sizeof(winid), "%d", first_size_win->w_id); apply_autocmds(EVENT_WINRESIZED, winid, winid, FALSE, first_size_win->w_buffer); + #ifdef FEAT_EVAL } restore_v_event(v_event, &save_v_event); + #endif } if (trigger_scroll) { + #ifdef FEAT_EVAL save_v_event_T save_v_event; dict_T *v_event = get_v_event(&save_v_event); *************** *** 3128,3141 **** dict_extend(v_event, scroll_dict, (char_u *)"move", NULL); dict_set_items_ro(v_event); dict_unref(scroll_dict); ! char_u winid[NUMBUFLEN]; vim_snprintf((char *)winid, sizeof(winid), "%d", first_scroll_win->w_id); apply_autocmds(EVENT_WINSCROLLED, winid, winid, FALSE, first_scroll_win->w_buffer); ! restore_v_event(v_event, &save_v_event); } recursive = FALSE; --- 3144,3158 ---- dict_extend(v_event, scroll_dict, (char_u *)"move", NULL); dict_set_items_ro(v_event); dict_unref(scroll_dict); ! #endif char_u winid[NUMBUFLEN]; vim_snprintf((char *)winid, sizeof(winid), "%d", first_scroll_win->w_id); apply_autocmds(EVENT_WINSCROLLED, winid, winid, FALSE, first_scroll_win->w_buffer); ! #ifdef FEAT_EVAL restore_v_event(v_event, &save_v_event); + #endif } recursive = FALSE; *** ../vim-9.0.0918/src/version.c 2022-11-22 12:58:22.754664254 +0000 --- src/version.c 2022-11-22 13:24:53.262812775 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 919, /**/ -- Laughing helps. It's like jogging on the inside. /// 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 ///