From 236083884cfe6c874e03e6cb4e7cb08809c1333c Mon Sep 17 00:00:00 2001 From: Marco De Donno Date: Sun, 4 Feb 2024 22:37:33 +0100 Subject: [PATCH] fix: do not alter jumplist when jumping to a line in a file (#2910) --- lua/telescope/builtin/__files.lua | 2 +- lua/telescope/previewers/buffer_previewer.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/telescope/builtin/__files.lua b/lua/telescope/builtin/__files.lua index af1a65c..5071374 100644 --- a/lua/telescope/builtin/__files.lua +++ b/lua/telescope/builtin/__files.lua @@ -591,7 +591,7 @@ files.tags = function(opts) return "\\" .. x end) - vim.cmd "norm! gg" + vim.cmd "keepjumps norm! gg" vim.fn.search(scode) vim.cmd "norm! zz" else diff --git a/lua/telescope/previewers/buffer_previewer.lua b/lua/telescope/previewers/buffer_previewer.lua index 92b5482..0b9c09b 100644 --- a/lua/telescope/previewers/buffer_previewer.lua +++ b/lua/telescope/previewers/buffer_previewer.lua @@ -293,7 +293,7 @@ local search_cb_jump = function(self, bufnr, query) end vim.api.nvim_buf_call(bufnr, function() pcall(vim.fn.matchdelete, self.state.hl_id, self.state.winid) - vim.cmd "norm! gg" + vim.cmd "keepjumps norm! gg" vim.fn.search(query, "W") vim.cmd "norm! zz" @@ -612,7 +612,7 @@ previewers.ctags = defaulter(function(opts) end) pcall(vim.fn.matchdelete, self.state.hl_id, self.state.winid) - vim.cmd "norm! gg" + vim.cmd "keepjumps norm! gg" vim.fn.search(scode, "W") vim.cmd "norm! zz" @@ -1115,7 +1115,7 @@ previewers.highlights = defaulter(function(_) vim.schedule(function() vim.api.nvim_buf_call(self.state.bufnr, function() - vim.cmd "norm! gg" + vim.cmd "keepjumps norm! gg" vim.fn.search(entry.value .. " ") local lnum = vim.api.nvim_win_get_cursor(self.state.winid)[1] -- That one is actually a match but its better to use it like that then matchadd