Mercurial > vim
comparison src/structs.h @ 18763:49b78d6465e5 v8.1.2371
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Commit: https://github.com/vim/vim/commit/05ad5ff0ab34ed9a5296dedd420ca81698b8ce22
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 22:48:27 2019 +0100
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/5291)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 30 Nov 2019 23:00:05 +0100 |
parents | 6e3dc2d630c2 |
children | 2bdc2e1f6e1f |
comparison
equal
deleted
inserted
replaced
18762:19582783e5ad | 18763:49b78d6465e5 |
---|---|
2117 // Currently all crypt methods work inplace. If one is added that isn't then | 2117 // Currently all crypt methods work inplace. If one is added that isn't then |
2118 // define this. | 2118 // define this. |
2119 // # define CRYPT_NOT_INPLACE 1 | 2119 // # define CRYPT_NOT_INPLACE 1 |
2120 #endif | 2120 #endif |
2121 | 2121 |
2122 #ifdef FEAT_TEXT_PROP | 2122 #ifdef FEAT_PROP_POPUP |
2123 typedef enum { | 2123 typedef enum { |
2124 POPPOS_BOTLEFT, | 2124 POPPOS_BOTLEFT, |
2125 POPPOS_TOPLEFT, | 2125 POPPOS_TOPLEFT, |
2126 POPPOS_BOTRIGHT, | 2126 POPPOS_BOTRIGHT, |
2127 POPPOS_TOPRIGHT, | 2127 POPPOS_TOPRIGHT, |
2613 dict_T *b_vars; // internal variables, local to buffer | 2613 dict_T *b_vars; // internal variables, local to buffer |
2614 | 2614 |
2615 listener_T *b_listener; | 2615 listener_T *b_listener; |
2616 list_T *b_recorded_changes; | 2616 list_T *b_recorded_changes; |
2617 #endif | 2617 #endif |
2618 #ifdef FEAT_TEXT_PROP | 2618 #ifdef FEAT_PROP_POPUP |
2619 int b_has_textprop; // TRUE when text props were added | 2619 int b_has_textprop; // TRUE when text props were added |
2620 hashtab_T *b_proptypes; // text property types local to buffer | 2620 hashtab_T *b_proptypes; // text property types local to buffer |
2621 #endif | 2621 #endif |
2622 | 2622 |
2623 #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) | 2623 #if defined(FEAT_BEVAL) && defined(FEAT_EVAL) |
2766 frame_T *tp_topframe; // topframe for the windows | 2766 frame_T *tp_topframe; // topframe for the windows |
2767 win_T *tp_curwin; // current window in this Tab page | 2767 win_T *tp_curwin; // current window in this Tab page |
2768 win_T *tp_prevwin; // previous window in this Tab page | 2768 win_T *tp_prevwin; // previous window in this Tab page |
2769 win_T *tp_firstwin; // first window in this Tab page | 2769 win_T *tp_firstwin; // first window in this Tab page |
2770 win_T *tp_lastwin; // last window in this Tab page | 2770 win_T *tp_lastwin; // last window in this Tab page |
2771 #ifdef FEAT_TEXT_PROP | 2771 #ifdef FEAT_PROP_POPUP |
2772 win_T *tp_first_popupwin; // first popup window in this Tab page | 2772 win_T *tp_first_popupwin; // first popup window in this Tab page |
2773 #endif | 2773 #endif |
2774 long tp_old_Rows; // Rows when Tab page was left | 2774 long tp_old_Rows; // Rows when Tab page was left |
2775 long tp_old_Columns; // Columns when Tab page was left | 2775 long tp_old_Columns; // Columns when Tab page was left |
2776 long tp_ch_used; // value of 'cmdheight' when frame size | 2776 long tp_ch_used; // value of 'cmdheight' when frame size |
3018 int w_status_height; // number of status lines (0 or 1) | 3018 int w_status_height; // number of status lines (0 or 1) |
3019 int w_wincol; // Leftmost column of window in screen. | 3019 int w_wincol; // Leftmost column of window in screen. |
3020 int w_width; // Width of window, excluding separation. | 3020 int w_width; // Width of window, excluding separation. |
3021 int w_vsep_width; // Number of separator columns (0 or 1). | 3021 int w_vsep_width; // Number of separator columns (0 or 1). |
3022 pos_save_T w_save_cursor; // backup of cursor pos and topline | 3022 pos_save_T w_save_cursor; // backup of cursor pos and topline |
3023 #ifdef FEAT_TEXT_PROP | 3023 #ifdef FEAT_PROP_POPUP |
3024 int w_popup_flags; // POPF_ values | 3024 int w_popup_flags; // POPF_ values |
3025 int w_popup_handled; // POPUP_HANDLE[0-9] flags | 3025 int w_popup_handled; // POPUP_HANDLE[0-9] flags |
3026 char_u *w_popup_title; | 3026 char_u *w_popup_title; |
3027 poppos_T w_popup_pos; | 3027 poppos_T w_popup_pos; |
3028 int w_popup_fixed; // do not shift popup to fit on screen | 3028 int w_popup_fixed; // do not shift popup to fit on screen |