aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/tag.c
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
committerJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
commitd5f194ce780c95821a855aca3c19426576d28ae0 (patch)
treed45f461b19f9118ad2bb1f440a7a08973ad18832 /src/nvim/tag.c
parentc5d770d311841ea5230426cc4c868e8db27300a8 (diff)
parent44740e561fc93afe3ebecfd3618bda2d2abeafb0 (diff)
downloadrneovim-rahm.tar.gz
rneovim-rahm.tar.bz2
rneovim-rahm.zip
Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm
Diffstat (limited to 'src/nvim/tag.c')
-rw-r--r--src/nvim/tag.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 3e0bb32391..c676b00986 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -34,7 +34,6 @@
#include "nvim/hashtab.h"
#include "nvim/hashtab_defs.h"
#include "nvim/help.h"
-#include "nvim/highlight.h"
#include "nvim/highlight_defs.h"
#include "nvim/input.h"
#include "nvim/insexpand.h"
@@ -451,7 +450,7 @@ void do_tag(char *tag, int type, int count, int forceit, bool verbose)
curwin->w_cursor.col = saved_fmark.mark.col;
curwin->w_set_curswant = true;
check_cursor(curwin);
- if ((fdo_flags & FDO_TAG) && old_KeyTyped) {
+ if ((fdo_flags & kOptFdoFlagTag) && old_KeyTyped) {
foldOpenCursor();
}
@@ -669,7 +668,7 @@ void do_tag(char *tag, int type, int count, int forceit, bool verbose)
if (ask_for_selection) {
// Ask to select a tag from the list.
- int i = prompt_for_number(NULL);
+ int i = prompt_for_input(NULL, 0, false, NULL);
if (i <= 0 || i > num_matches || got_int) {
// no valid choice: don't change anything
if (use_tagstack) {
@@ -2294,17 +2293,17 @@ int find_tags(char *pat, int *num_matches, char ***matchesp, int flags, int minc
// Change the value of 'ignorecase' according to 'tagcase' for the
// duration of this function.
switch (curbuf->b_tc_flags ? curbuf->b_tc_flags : tc_flags) {
- case TC_FOLLOWIC: break;
- case TC_IGNORE:
+ case kOptTcFlagFollowic: break;
+ case kOptTcFlagIgnore:
p_ic = true;
break;
- case TC_MATCH:
+ case kOptTcFlagMatch:
p_ic = false;
break;
- case TC_FOLLOWSCS:
+ case kOptTcFlagFollowscs:
p_ic = ignorecase(pat);
break;
- case TC_SMART:
+ case kOptTcFlagSmart:
p_ic = ignorecase_opt(pat, true, true);
break;
default:
@@ -2846,7 +2845,7 @@ static int jumpto_tag(const char *lbuf_arg, int forceit, bool keep_help)
// If it was a CTRL-W CTRL-] command split window now. For ":tab tag"
// open a new tab page.
- if (postponed_split && (swb_flags & (SWB_USEOPEN | SWB_USETAB))) {
+ if (postponed_split && (swb_flags & (kOptSwbFlagUseopen | kOptSwbFlagUsetab))) {
buf_T *const existing_buf = buflist_findname_exp(fname);
if (existing_buf != NULL) {
@@ -3015,7 +3014,7 @@ static int jumpto_tag(const char *lbuf_arg, int forceit, bool keep_help)
if (curbuf->b_help) {
set_topline(curwin, curwin->w_cursor.lnum);
}
- if ((fdo_flags & FDO_TAG) && old_KeyTyped) {
+ if ((fdo_flags & kOptFdoFlagTag) && old_KeyTyped) {
foldOpenCursor();
}
}