diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-03-22 16:56:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 16:56:35 +0100 |
| commit | d5d4d980427aca3849b90bfe1694b6d1d14532fb (patch) | |
| tree | d5c5a37daaa477af4524125605c0e77e9fbc3a57 | |
| parent | 84348696329b4504b851f0de4a9a9a52321ce59d (diff) | |
| parent | 3b776cb0a7574bf11c20fe0a1d91ec1d21d8ebeb (diff) | |
Merge pull request #6298 from kayhide/nix-edit-support-kakoune
nix edit: support kakoune
| -rw-r--r-- | src/libcmd/command.cc | 3 | ||||
| -rw-r--r-- | src/nix/edit.md | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc index dc8fa9e5a..a53b029b7 100644 --- a/src/libcmd/command.cc +++ b/src/libcmd/command.cc @@ -204,7 +204,8 @@ Strings editorFor(const Pos & pos) if (pos.line > 0 && ( editor.find("emacs") != std::string::npos || editor.find("nano") != std::string::npos || - editor.find("vim") != std::string::npos)) + editor.find("vim") != std::string::npos || + editor.find("kak") != std::string::npos)) args.push_back(fmt("+%d", pos.line)); args.push_back(pos.file); return args; diff --git a/src/nix/edit.md b/src/nix/edit.md index 80563d06b..89bd09abf 100644 --- a/src/nix/edit.md +++ b/src/nix/edit.md @@ -24,8 +24,8 @@ this attribute to the location of the definition of the `meta.description`, `version` or `name` derivation attributes. The editor to invoke is specified by the `EDITOR` environment -variable. It defaults to `cat`. If the editor is `emacs`, `nano` or -`vim`, it is passed the line number of the derivation using the -argument `+<lineno>`. +variable. It defaults to `cat`. If the editor is `emacs`, `nano`, +`vim` or `kak`, it is passed the line number of the derivation using +the argument `+<lineno>`. )"" |