Patch 8.1.1971
Problem: Manually enabling features causes build errors. (John Marriott)
Solution: Adjust #ifdefs.
Files: src/proto.h, src/popupmnu.c, src/buffer.c, src/quickfix.c,
src/ui.c
*** ../vim-8.1.1970/src/proto.h 2019-08-27 22:48:12.741480663 +0200
--- src/proto.h 2019-09-03 22:55:29.159559923 +0200
***************
*** 181,189 ****
# if defined(FEAT_PROFILE) || defined(FEAT_RELTIME)
# include "profiler.pro"
# endif
! # ifdef FEAT_QUICKFIX
! # include "quickfix.pro"
! # endif
# include "regexp.pro"
# include "scriptfile.pro"
# include "screen.pro"
--- 181,187 ----
# if defined(FEAT_PROFILE) || defined(FEAT_RELTIME)
# include "profiler.pro"
# endif
! # include "quickfix.pro"
# include "regexp.pro"
# include "scriptfile.pro"
# include "screen.pro"
*** ../vim-8.1.1970/src/popupmnu.c 2019-08-21 19:33:13.472388892 +0200
--- src/popupmnu.c 2019-09-03 23:01:45.641842030 +0200
***************
*** 760,767 ****
# else
# define use_popup 0
# endif
has_info = TRUE;
!
// Open a preview window. 3 lines by default. Prefer
// 'previewheight' if set and smaller.
g_do_tagpreview = 3;
--- 760,768 ----
# else
# define use_popup 0
# endif
+ # ifdef FEAT_TEXT_PROP
has_info = TRUE;
! # endif
// Open a preview window. 3 lines by default. Prefer
// 'previewheight' if set and smaller.
g_do_tagpreview = 3;
*** ../vim-8.1.1970/src/buffer.c 2019-08-21 22:25:26.034016761 +0200
--- src/buffer.c 2019-09-03 23:06:05.744628529 +0200
***************
*** 45,54 ****
static void free_buffer(buf_T *);
static void free_buffer_stuff(buf_T *buf, int free_options);
static void clear_wininfo(buf_T *buf);
- #if defined(FEAT_JOB_CHANNEL) \
- || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3)
- static int find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp);
- #endif
#ifdef UNIX
# define dev_T dev_t
--- 45,50 ----
***************
*** 5457,5463 ****
#if defined(FEAT_JOB_CHANNEL) \
|| defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
|| defined(PROTO)
! # define SWITCH_TO_WIN
/*
* Find a window that contains "buf" and switch to it.
--- 5453,5476 ----
#if defined(FEAT_JOB_CHANNEL) \
|| defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
|| defined(PROTO)
! /*
! * Find a window for buffer "buf".
! * If found OK is returned and "wp" and "tp" are set to the window and
tabpage.
! * If not found FAIL is returned.
! */
! static int
! find_win_for_buf(
! buf_T *buf,
! win_T **wp,
! tabpage_T **tp)
! {
! FOR_ALL_TAB_WINDOWS(*tp, *wp)
! if ((*wp)->w_buffer == buf)
! goto win_found;
! return FAIL;
! win_found:
! return OK;
! }
/*
* Find a window that contains "buf" and switch to it.
***************
*** 5497,5523 ****
}
#endif
- #if defined(FEAT_QUICKFIX) || defined(SWITCH_TO_WIN) || defined(PROTO)
- /*
- * Find a window for buffer "buf".
- * If found OK is returned and "wp" and "tp" are set to the window and
tabpage.
- * If not found FAIL is returned.
- */
- static int
- find_win_for_buf(
- buf_T *buf,
- win_T **wp,
- tabpage_T **tp)
- {
- FOR_ALL_TAB_WINDOWS(*tp, *wp)
- if ((*wp)->w_buffer == buf)
- goto win_found;
- return FAIL;
- win_found:
- return OK;
- }
- #endif
-
/*
* Set 'buflisted' for curbuf to "on" and trigger autocommands if it changed.
*/
--- 5510,5515 ----
*** ../vim-8.1.1970/src/quickfix.c 2019-09-02 22:31:08.010296361 +0200
--- src/quickfix.c 2019-09-03 23:07:42.800172340 +0200
***************
*** 3381,3389 ****
int prev_winid;
int opened_window = FALSE;
int print_message = TRUE;
- #ifdef FEAT_FOLDING
int old_KeyTyped = KeyTyped; // getting file may
reset it
- #endif
int retval = OK;
if (qi == NULL)
--- 3381,3387 ----
***************
*** 3427,3433 ****
goto theend;
retval = qf_jump_to_buffer(qi, qf_index, qf_ptr, forceit, prev_winid,
! &opened_window, old_KeyTyped, print_message);
if (retval == NOTDONE)
{
// Quickfix/location list is freed by an autocmd
--- 3425,3431 ----
goto theend;
retval = qf_jump_to_buffer(qi, qf_index, qf_ptr, forceit, prev_winid,
! &opened_window, old_KeyTyped, print_message);
if (retval == NOTDONE)
{
// Quickfix/location list is freed by an autocmd
*** ../vim-8.1.1970/src/ui.c 2019-08-24 18:23:06.419390846 +0200
--- src/ui.c 2019-09-03 23:14:25.782265957 +0200
***************
*** 3637,3642 ****
--- 3637,3644 ----
|| defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \
|| defined(FEAT_GUI_PHOTON) || defined(FEAT_TERM_POPUP_MENU) \
|| defined(PROTO)
+ # define NEED_VCOL2COL
+
/*
* Translate window coordinates to buffer position without any side effects
*/
***************
*** 3678,3687 ****
}
#endif
! #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC)
\
! || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \
! || defined(FEAT_GUI_PHOTON) || defined(FEAT_BEVAL) \
! || defined(FEAT_TERM_POPUP_MENU) || defined(PROTO)
/*
* Convert a virtual (screen) column to a character column.
* The first column is one.
--- 3680,3687 ----
}
#endif
! #if defined(NEED_VCOL2COL) || defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP) \
! || defined(PROTO)
/*
* Convert a virtual (screen) column to a character column.
* The first column is one.
*** ../vim-8.1.1970/src/version.c 2019-09-03 22:23:34.484284108 +0200
--- src/version.c 2019-09-03 23:19:07.425603382 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 1971,
/**/
--
If Microsoft would build a car...
... the oil, water temperature, and alternator warning lights would
all be replaced by a single "General Protection Fault" warning light.
/// Bram Moolenaar -- [email protected] -- 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 ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201909032120.x83LKWb1000782%40masaka.moolenaar.net.
