Skip to content

Commit 4e28c8d

Browse files
martintrojervoldikss
authored andcommitted
Add support for HGEDITOR similar to GIT_EDITOR
1 parent 64b1003 commit 4e28c8d

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ Default: `['.project', '.git', '.hg', '.svn', '.root']`
268268

269269
Type `Boolean`. Whether to override `$GIT_EDITOR` in floaterm terminals so git commands can
270270
open open an editor in the same neovim instance. See [git](#git) for details.
271+
This flag also overrides `$HGEDITOR` for Mercurial.
271272

272273
Default: `v:true`
273274

autoload/floaterm/edita/neovim/editor.vim

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ function! floaterm#edita#neovim#editor#open(target, client)
55
call floaterm#util#open([{'filename': fnameescape(a:target)}], opener)
66
let mode = floaterm#edita#neovim#util#mode(a:client)
77
let b:edita = sockconnect(mode, a:client, { 'rpc': 1 })
8-
if index([
8+
let filename = expand('%:t')
9+
if (index([
910
\ 'COMMIT_EDITMSG',
1011
\ 'MERGE_MSG',
1112
\ 'git-rebase-todo',
1213
\ 'git-revise-todo',
13-
\ 'addp-hunk-edit.diff'
14-
\ ], expand('%:t')) > -1
14+
\ 'addp-hunk-edit.diff',
15+
\ ], filename) > -1) || (stridx(filename, 'commit.hg.txt') > -1)
1516
setlocal bufhidden=wipe
1617
augroup edita_buffer
1718
autocmd! * <buffer>

autoload/floaterm/edita/vim/editor.vim

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ function! floaterm#edita#vim#editor#open(target, bufnr)
55
let opener = floaterm#config#get(a:bufnr, 'opener', g:floaterm_opener)
66
call floaterm#util#open([{'filename': fnameescape(a:target)}], opener)
77
let b:edita = a:bufnr
8-
if index([
8+
let filename = expand('%:t')
9+
if (index([
910
\ 'COMMIT_EDITMSG',
1011
\ 'MERGE_MSG',
1112
\ 'git-rebase-todo',
1213
\ 'git-revise-todo',
13-
\ 'addp-hunk-edit.diff'
14-
\ ], expand('%:t')) > -1
14+
\ 'addp-hunk-edit.diff',
15+
\ ], filename) > -1) || (stridx(filename, 'commit.hg.txt') > -1)
1516
setlocal bufhidden=wipe
1617
augroup edita_buffer
1718
autocmd! * <buffer>

autoload/floaterm/util.vim

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ function! floaterm#util#setenv() abort
162162
let env.FLOATERM = editor
163163
if g:floaterm_giteditor
164164
let env.GIT_EDITOR = editor
165+
let env.HGEDITOR = editor
165166
endif
166167
return env
167168
endfunction

0 commit comments

Comments
 (0)