Port changes from master

This commit is contained in:
Kovid Goyal 2018-06-05 07:56:41 +05:30
parent 4fa8cb562a
commit b5e452942e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 2 deletions

View File

@ -22,8 +22,8 @@ Changelog
- icat kitten: Add :option:`kitty +kitten icat --print-window-size` to easily
detect the window size in pixels from scripting languages (:iss:`581`)
- hints kitten: Allow selecting hashes from the terminal useful for git
commits. (:pull:`604`)
- hints kitten: Allow selecting hashes from the terminal with
:sc:`insert_selected_hash` useful for git commits. (:pull:`604`)
- Allow specifying initial window size in number of cells in addition to pixels
(:iss:`436`)

View File

@ -775,6 +775,10 @@ output of things like: ls -1'''))
k('insert_selected_word', 'kitty_mod+p>w', 'kitten hints --type word --program -', _('Insert selected word'), long_text=_('''
Select words and insert into terminal.'''))
k('insert_selected_hash', 'kitty_mod+p>h', 'kitten hints --type hash --program -', _('Insert selected hash'), long_text=_('''
Select something that looks like a hash and insert it into the terminal.
Useful with git, which uses sha1 hashes to identify commits'''))
# }}}
g('shortcuts.misc') # {{{